Skip to content

Revert problematic change to app context handling #1474

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 18, 2016
Merged

Revert problematic change to app context handling #1474

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2970bec
Revert "Merge pull request #1451 from ggouaillardet/topic/orte_fork_w…
Mar 18, 2016
8f410d7
Revert one part of open-mpi/ompi@4d0cc27eb7c96a3ad50abf309b6f3186e2f0…
Mar 18, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions orte/mca/odls/base/odls_base_default_fns.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* All rights reserved.
* Copyright (c) 2011-2013 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2013-2016 Intel, Inc. All rights reserved.
* Copyright (c) 2014-2016 Research Organization for Information Science
* Copyright (c) 2014 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* $COPYRIGHT$
*
Expand Down Expand Up @@ -973,10 +973,8 @@ void orte_odls_base_default_launch_local(int fd, short sd, void *cbdata)
app->argv = NULL;
/* now create a new one that starts with the fork agent */
app->argv = opal_argv_copy(orte_fork_agent);
/* app->argv[0] is the basename, but we require the full name that is in app->app */
opal_argv_append_nosize(&app->argv, app->app);
/* add back the rest of original argv */
for (inm=1; NULL != argvsav[inm]; inm++) {
/* add back the original argv */
for (inm=0; NULL != argvsav[inm]; inm++) {
opal_argv_append_nosize(&app->argv, argvsav[inm]);
}
/* the app exe name itself is in the argvsav array, so
Expand Down
2 changes: 0 additions & 2 deletions orte/tools/orterun/orterun.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1676,8 +1676,6 @@ static int create_app(int argc, char* argv[],
rc = ORTE_ERR_NOT_FOUND;
goto cleanup;
}
free(app->argv[0]);
app->argv[0] = opal_basename(app->app);

/* if this is a Java application, we have a bit more work to do. Such
* applications actually need to be run under the Java virtual machine
Expand Down