1
1
Signed-off-by: Ralph Castain <rhc@open-mpi.org>
Этот коммит содержится в:
Ralph Castain 2017-06-21 13:19:51 -07:00
родитель 0f54799003
Коммит 3e78f84093
2 изменённых файлов: 14 добавлений и 5 удалений

Просмотреть файл

@ -456,6 +456,7 @@ int pmix2x_get(const opal_process_name_t *proc, const char *key,
size_t sz = 0, n; size_t sz = 0, n;
opal_value_t *ival; opal_value_t *ival;
pmix_value_t *pval = NULL; pmix_value_t *pval = NULL;
int ret;
opal_output_verbose(1, opal_pmix_base_framework.framework_output, opal_output_verbose(1, opal_pmix_base_framework.framework_output,
"%s pmix2x:client get on proc %s key %s", "%s pmix2x:client get on proc %s key %s",
@ -517,8 +518,11 @@ int pmix2x_get(const opal_process_name_t *proc, const char *key,
rc = PMIx_Get(&p, key, pinfo, sz, &pval); rc = PMIx_Get(&p, key, pinfo, sz, &pval);
if (PMIX_SUCCESS == rc) { if (PMIX_SUCCESS == rc) {
ival = OBJ_NEW(opal_value_t); ival = OBJ_NEW(opal_value_t);
pmix2x_value_unload(ival, pval); if (OPAL_SUCCESS != (ret = pmix2x_value_unload(ival, pval))) {
rc = pmix2x_convert_opalrc(ret);
} else {
*val = ival; *val = ival;
}
PMIX_VALUE_FREE(pval, 1); PMIX_VALUE_FREE(pval, 1);
} }
PMIX_INFO_FREE(pinfo, sz); PMIX_INFO_FREE(pinfo, sz);
@ -728,6 +732,7 @@ int pmix2x_lookup(opal_list_t *data, opal_list_t *info)
size_t cnt, n, sz; size_t cnt, n, sz;
opal_value_t *iptr; opal_value_t *iptr;
opal_pmix2x_jobid_trkr_t *jptr, *job; opal_pmix2x_jobid_trkr_t *jptr, *job;
int ret;
opal_output_verbose(1, opal_pmix_base_framework.framework_output, opal_output_verbose(1, opal_pmix_base_framework.framework_output,
"pmix2x:client lookup"); "pmix2x:client lookup");
@ -792,7 +797,9 @@ int pmix2x_lookup(opal_list_t *data, opal_list_t *info)
opal_list_append(&mca_pmix_pmix2x_component.jobids, &job->super); opal_list_append(&mca_pmix_pmix2x_component.jobids, &job->super);
} }
d->proc.vpid = pmix2x_convert_rank(pdata[n].proc.rank); d->proc.vpid = pmix2x_convert_rank(pdata[n].proc.rank);
pmix2x_value_unload(&d->value, &pdata[n].value); if (OPAL_SUCCESS != (ret = pmix2x_value_unload(&d->value, &pdata[n].value))) {
OPAL_ERROR_LOG(ret);
}
} }
OPAL_PMIX_RELEASE_THREAD(&opal_pmix_base.lock); OPAL_PMIX_RELEASE_THREAD(&opal_pmix_base.lock);
} }
@ -1069,7 +1076,7 @@ static void spcbfunc(pmix_status_t status,
{ {
pmix2x_opcaddy_t *op = (pmix2x_opcaddy_t*)cbdata; pmix2x_opcaddy_t *op = (pmix2x_opcaddy_t*)cbdata;
opal_pmix2x_jobid_trkr_t *job; opal_pmix2x_jobid_trkr_t *job;
opal_jobid_t jobid; opal_jobid_t jobid = OPAL_JOBID_INVALID;
int rc; int rc;
OPAL_ACQUIRE_OBJECT(op); OPAL_ACQUIRE_OBJECT(op);

Просмотреть файл

@ -1027,7 +1027,9 @@ static void toolcbfunc(int status,
job = OBJ_NEW(opal_pmix2x_jobid_trkr_t); job = OBJ_NEW(opal_pmix2x_jobid_trkr_t);
(void)strncpy(job->nspace, p.nspace, PMIX_MAX_NSLEN); (void)strncpy(job->nspace, p.nspace, PMIX_MAX_NSLEN);
job->jobid = proc.jobid; job->jobid = proc.jobid;
OPAL_PMIX_ACQUIRE_THREAD(&opal_pmix_base.lock);
opal_list_append(&mca_pmix_pmix2x_component.jobids, &job->super); opal_list_append(&mca_pmix_pmix2x_component.jobids, &job->super);
OPAL_PMIX_RELEASE_THREAD(&opal_pmix_base.lock);
} }
/* pass it down */ /* pass it down */