Skip to content

Commit 6955e1e

Browse files
committed
pmix/ext11: fix compilation
the argc field from the opal_pmix_app_t struct was removed, so adjust the pmix/ext11 glue accordingly. Signed-off-by: Gilles Gouaillardet <[email protected]>
1 parent 7ab26a4 commit 6955e1e

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

opal/mca/pmix/ext11/pmix_ext_client.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -924,7 +924,7 @@ int pmix1_spawn(opal_list_t *job_info, opal_list_t *apps, opal_jobid_t *jobid)
924924
n=0;
925925
OPAL_LIST_FOREACH(app, apps, opal_pmix_app_t) {
926926
papps[n].cmd = strdup(app->cmd);
927-
papps[n].argc = app->argc;
927+
papps[n].argc = opal_argv_count(app->argv);
928928
papps[n].argv = opal_argv_copy(app->argv);
929929
papps[n].env = opal_argv_copy(app->env);
930930
papps[n].maxprocs = app->maxprocs;
@@ -1021,7 +1021,7 @@ int pmix1_spawnnb(opal_list_t *job_info, opal_list_t *apps,
10211021
n=0;
10221022
OPAL_LIST_FOREACH(app, apps, opal_pmix_app_t) {
10231023
op->apps[n].cmd = strdup(app->cmd);
1024-
op->apps[n].argc = app->argc;
1024+
op->apps[n].argc = opal_argv_count(app->argv);
10251025
op->apps[n].argv = opal_argv_copy(app->argv);
10261026
op->apps[n].env = opal_argv_copy(app->env);
10271027
op->apps[n].maxprocs = app->maxprocs;

opal/mca/pmix/ext11/pmix_ext_server_north.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -591,7 +591,6 @@ static pmix_status_t server_spawn_fn(const pmix_proc_t *p,
591591
if (NULL != apps[n].cmd) {
592592
app->cmd = strdup(apps[n].cmd);
593593
}
594-
app->argc = apps[n].argc;
595594
if (NULL != apps[n].argv) {
596595
app->argv = opal_argv_copy(apps[n].argv);
597596
}

0 commit comments

Comments
 (0)