Merge pull request #4214 from karasevb/pmix1_hang_fix
pmix: fixed immediate request for PMIx v1.2
Этот коммит содержится в:
Коммит
3b3ce243bb
@ -474,8 +474,14 @@ int pmix1_get(const opal_process_name_t *proc, const char *key,
|
|||||||
PMIX_INFO_CREATE(pinfo, ninfo);
|
PMIX_INFO_CREATE(pinfo, ninfo);
|
||||||
n=0;
|
n=0;
|
||||||
OPAL_LIST_FOREACH(ival, info, opal_value_t) {
|
OPAL_LIST_FOREACH(ival, info, opal_value_t) {
|
||||||
(void)strncpy(pinfo[n].key, ival->key, PMIX_MAX_KEYLEN);
|
if (0 == strcmp(ival->key, OPAL_PMIX_IMMEDIATE)) {
|
||||||
pmix1_value_load(&pinfo[n].value, ival);
|
(void)strncpy(pinfo[n].key, OPAL_PMIX_OPTIONAL, PMIX_MAX_KEYLEN);
|
||||||
|
pmix1_value_load(&pinfo[n].value, ival);
|
||||||
|
} else {
|
||||||
|
(void)strncpy(pinfo[n].key, ival->key, PMIX_MAX_KEYLEN);
|
||||||
|
pmix1_value_load(&pinfo[n].value, ival);
|
||||||
|
}
|
||||||
|
++n;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
pinfo = NULL;
|
pinfo = NULL;
|
||||||
@ -562,8 +568,14 @@ int pmix1_getnb(const opal_process_name_t *proc, const char *key,
|
|||||||
PMIX_INFO_CREATE(op->info, op->sz);
|
PMIX_INFO_CREATE(op->info, op->sz);
|
||||||
n=0;
|
n=0;
|
||||||
OPAL_LIST_FOREACH(ival, info, opal_value_t) {
|
OPAL_LIST_FOREACH(ival, info, opal_value_t) {
|
||||||
(void)strncpy(op->info[n].key, ival->key, PMIX_MAX_KEYLEN);
|
if (0 == strcmp(ival->key, OPAL_PMIX_IMMEDIATE)) {
|
||||||
pmix1_value_load(&op->info[n].value, ival);
|
(void)strncpy(op->info[n].key, OPAL_PMIX_OPTIONAL, PMIX_MAX_KEYLEN);
|
||||||
|
pmix1_value_load(&op->info[n].value, ival);
|
||||||
|
} else {
|
||||||
|
(void)strncpy(op->info[n].key, ival->key, PMIX_MAX_KEYLEN);
|
||||||
|
pmix1_value_load(&op->info[n].value, ival);
|
||||||
|
}
|
||||||
|
++n;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user