Skip to content

v3.1.x: Backport threadshift for show_help messages #5537

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
Aug 14, 2018
Merged

v3.1.x: Backport threadshift for show_help messages #5537

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
20 changes: 17 additions & 3 deletions orte/orted/pmix/pmix_server_gen.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -879,6 +879,16 @@ void pmix_tool_connected_fn(opal_list_t *info,

}

static void lgcbfn(int sd, short args, void *cbdata)
{
orte_pmix_server_op_caddy_t *cd = (orte_pmix_server_op_caddy_t*)cbdata;

if (NULL != cd->cbfunc) {
cd->cbfunc(cd->status, cd->cbdata);
}
OBJ_RELEASE(cd);
}

void pmix_server_log_fn(opal_process_name_t *requestor,
opal_list_t *info,
opal_list_t *directives,
Expand Down Expand Up @@ -924,9 +934,13 @@ void pmix_server_log_fn(opal_process_name_t *requestor,
}
}

if (NULL != cbfunc) {
cbfunc(OPAL_SUCCESS, cbdata);
}
/* we cannot directly execute the callback here
* as it would threadlock - so shift to somewhere
* safe */
rc = ORTE_SUCCESS; // unused - silence compiler warning
ORTE_PMIX_THREADSHIFT(requestor, NULL, rc,
NULL, NULL, lgcbfn,
cbfunc, cbdata);
}

int pmix_server_job_ctrl_fn(const opal_process_name_t *requestor,
Expand Down