Skip to content
This repository was archived by the owner on Sep 30, 2022. It is now read-only.

Fix some typos in the PMIx 112 client integration #1282

Closed
wants to merge 1 commit into from
Closed

Fix some typos in the PMIx 112 client integration #1282

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
2 changes: 1 addition & 1 deletion ompi/communicator/comm_cid.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1357,7 +1357,7 @@ static int ompi_comm_allreduce_intra_pmix (int *inbuf, int *outbuf,
(void)asprintf(&pdat.value.key, "%s:%s:send:%d", port_string, tag, iter);
}

OPAL_PMIX_EXCHANGE(rc, &info, &pdat, 60);
OPAL_PMIX_EXCHANGE(rc, &info, &pdat, 0);
OBJ_DESTRUCT(&info);

if (OPAL_SUCCESS != rc) {
Expand Down
2 changes: 1 addition & 1 deletion ompi/dpm/dpm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ int ompi_dpm_connect_accept(ompi_communicator_t *comm, int root,
info.data.string = opal_argv_join(members, ':');
pdat.value.type = OPAL_STRING;

OPAL_PMIX_EXCHANGE(rc, &info, &pdat, 60);
OPAL_PMIX_EXCHANGE(rc, &info, &pdat, 0);
OBJ_DESTRUCT(&info);
if (OPAL_SUCCESS != rc) {
OBJ_DESTRUCT(&pdat);
Expand Down
6 changes: 4 additions & 2 deletions opal/mca/pmix/pmix112/pmix1_client.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -469,6 +469,7 @@ int pmix1_get(const opal_process_name_t *proc, const char *key,
OPAL_LIST_FOREACH(ival, info, opal_value_t) {
(void)strncpy(pinfo[n].key, ival->key, PMIX_MAX_KEYLEN);
pmix1_value_load(&pinfo[n].value, ival);
++n;
}
} else {
pinfo = NULL;
Expand Down Expand Up @@ -562,6 +563,7 @@ int pmix1_getnb(const opal_process_name_t *proc, const char *key,
OPAL_LIST_FOREACH(ival, info, opal_value_t) {
(void)strncpy(op->info[n].key, ival->key, PMIX_MAX_KEYLEN);
pmix1_value_load(&op->info[n].value, ival);
++n;
}
}
}
Expand Down Expand Up @@ -673,7 +675,7 @@ int pmix1_lookup(opal_list_t *data, opal_list_t *info)
PMIX_INFO_CREATE(pinfo, ninfo);
n=0;
OPAL_LIST_FOREACH(iptr, info, opal_value_t) {
(void)strncpy(pinfo[n++].key, iptr->key, PMIX_MAX_KEYLEN);
(void)strncpy(pinfo[n].key, iptr->key, PMIX_MAX_KEYLEN);
pmix1_value_load(&pinfo[n].value, iptr);
++n;
}
Expand Down Expand Up @@ -847,7 +849,7 @@ int pmix1_unpublish(char **keys, opal_list_t *info)
PMIX_INFO_CREATE(pinfo, ninfo);
n=0;
OPAL_LIST_FOREACH(iptr, info, opal_value_t) {
(void)strncpy(pinfo[n++].key, iptr->key, PMIX_MAX_KEYLEN);
(void)strncpy(pinfo[n].key, iptr->key, PMIX_MAX_KEYLEN);
pmix1_value_load(&pinfo[n].value, iptr);
++n;
}
Expand Down