Prevent thread log when show_help msgs are emitted
Signed-off-by: Ralph Castain <rhc@open-mpi.org>
Этот коммит содержится в:
родитель
30ffdc9efc
Коммит
97665d44cd
@ -59,7 +59,9 @@ static void localcbfunc(pmix_status_t status, void *cbdata)
|
|||||||
if (NULL != mycount->cbfunc) {
|
if (NULL != mycount->cbfunc) {
|
||||||
mycount->cbfunc(mycount->status, mycount->cbdata);
|
mycount->cbfunc(mycount->status, mycount->cbdata);
|
||||||
}
|
}
|
||||||
|
PMIX_RELEASE_THREAD(&mycount->lock);
|
||||||
PMIX_RELEASE(mycount);
|
PMIX_RELEASE(mycount);
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
PMIX_RELEASE_THREAD(&mycount->lock);
|
PMIX_RELEASE_THREAD(&mycount->lock);
|
||||||
}
|
}
|
||||||
|
@ -1023,6 +1023,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,
|
void pmix_server_log_fn(opal_process_name_t *requestor,
|
||||||
opal_list_t *info,
|
opal_list_t *info,
|
||||||
opal_list_t *directives,
|
opal_list_t *directives,
|
||||||
@ -1068,9 +1078,12 @@ void pmix_server_log_fn(opal_process_name_t *requestor,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (NULL != cbfunc) {
|
/* we cannot directly execute the callback here
|
||||||
cbfunc(OPAL_SUCCESS, cbdata);
|
* as it would threadlock - so shift to somewhere
|
||||||
}
|
* safe */
|
||||||
|
ORTE_PMIX_THREADSHIFT(requestor, NULL, rc,
|
||||||
|
NULL, NULL, lgcbfn,
|
||||||
|
cbfunc, cbdata);
|
||||||
}
|
}
|
||||||
|
|
||||||
int pmix_server_job_ctrl_fn(const opal_process_name_t *requestor,
|
int pmix_server_job_ctrl_fn(const opal_process_name_t *requestor,
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user