From 5f855cec5716920876fa2ac5942353d2843aacc2 Mon Sep 17 00:00:00 2001 From: Ralph Castain Date: Wed, 27 Jul 2016 11:31:45 -0700 Subject: [PATCH] Fix some typos in the PMIx 112 client integration. Due to MPI standard behavior expectations, do not timeout on calls to connect/accept. --- ompi/communicator/comm_cid.c | 2 +- ompi/dpm/dpm.c | 2 +- opal/mca/pmix/pmix112/pmix1_client.c | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ompi/communicator/comm_cid.c b/ompi/communicator/comm_cid.c index f0c332b5dc..8ac55db8c3 100644 --- a/ompi/communicator/comm_cid.c +++ b/ompi/communicator/comm_cid.c @@ -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) { diff --git a/ompi/dpm/dpm.c b/ompi/dpm/dpm.c index 2da39d920a..76ad0e8cb3 100644 --- a/ompi/dpm/dpm.c +++ b/ompi/dpm/dpm.c @@ -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); diff --git a/opal/mca/pmix/pmix112/pmix1_client.c b/opal/mca/pmix/pmix112/pmix1_client.c index 9bdfed394e..ff58db80e6 100644 --- a/opal/mca/pmix/pmix112/pmix1_client.c +++ b/opal/mca/pmix/pmix112/pmix1_client.c @@ -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; @@ -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; } } } @@ -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; } @@ -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; }