Skip to content

Avoid hanging in show_help if PMIx was unable to initialize #2511

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 1 commit into from
Dec 3, 2016
Merged

Avoid hanging in show_help if PMIx was unable to initialize #2511

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 14 additions & 8 deletions opal/mca/pmix/ext2x/pmix2x.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1328,19 +1328,20 @@ static void pmix2x_log(opal_list_t *info,
opal_value_t *ival;
size_t n, ninfo;
pmix2x_opcaddy_t *cd;

/* bozo check */
if (NULL == info || 0 == (ninfo = opal_list_get_size(info))) {
rc = OPAL_ERR_BAD_PARAM;
goto CLEANUP;
}
pmix_status_t prc;

/* setup the operation */
cd = OBJ_NEW(pmix2x_opcaddy_t);
cd->opcbfunc = cbfunc;
cd->cbdata = cbdata;
cd->ninfo = ninfo;

/* bozo check */
if (NULL == info || 0 == (ninfo = opal_list_get_size(info))) {
rc = OPAL_ERR_BAD_PARAM;
goto CLEANUP;
}

/* convert the list to an array of info objects */
PMIX_INFO_CREATE(cd->info, cd->ninfo);
n=0;
Expand All @@ -1351,14 +1352,19 @@ static void pmix2x_log(opal_list_t *info,
}

/* pass it down */
PMIx_Log_nb(cd->info, cd->ninfo, NULL, 0,
opcbfunc, cd);
if (PMIX_SUCCESS != (prc = PMIx_Log_nb(cd->info, cd->ninfo, NULL, 0,
opcbfunc, cd))) {
/* do not hang! */
rc = pmix2x_convert_rc(prc);
goto CLEANUP;
}
return;

CLEANUP:
if (NULL != cbfunc) {
cbfunc(rc, cbdata);
}
OBJ_RELEASE(cd);
}

/**** INSTANTIATE INTERNAL CLASSES ****/
Expand Down
23 changes: 15 additions & 8 deletions opal/mca/pmix/pmix2x/pmix2x.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1328,19 +1328,20 @@ static void pmix2x_log(opal_list_t *info,
opal_value_t *ival;
size_t n, ninfo;
pmix2x_opcaddy_t *cd;

/* bozo check */
if (NULL == info || 0 == (ninfo = opal_list_get_size(info))) {
rc = OPAL_ERR_BAD_PARAM;
goto CLEANUP;
}
pmix_status_t prc;

/* setup the operation */
cd = OBJ_NEW(pmix2x_opcaddy_t);
cd->opcbfunc = cbfunc;
cd->cbdata = cbdata;
cd->ninfo = ninfo;

/* bozo check */
if (NULL == info || 0 == (ninfo = opal_list_get_size(info))) {
rc = OPAL_ERR_BAD_PARAM;
goto CLEANUP;
}

/* convert the list to an array of info objects */
PMIX_INFO_CREATE(cd->info, cd->ninfo);
n=0;
Expand All @@ -1351,14 +1352,20 @@ static void pmix2x_log(opal_list_t *info,
}

/* pass it down */
PMIx_Log_nb(cd->info, cd->ninfo, NULL, 0,
opcbfunc, cd);
if (PMIX_SUCCESS != (prc = PMIx_Log_nb(cd->info, cd->ninfo, NULL, 0,
opcbfunc, cd))) {
/* do not hang! */
rc = pmix2x_convert_rc(prc);
goto CLEANUP;
}

return;

CLEANUP:
if (NULL != cbfunc) {
cbfunc(rc, cbdata);
}
OBJ_RELEASE(cd);
}

/**** INSTANTIATE INTERNAL CLASSES ****/
Expand Down