Silence Coverity warning, silence pmix_error_log of success
Signed-off-by: Ralph Castain <rhc@open-mpi.org>
Этот коммит содержится в:
родитель
b8d3999da2
Коммит
af85e48dd7
@ -2886,15 +2886,19 @@ static pmix_status_t dstore_store_modex(struct pmix_nspace_t *nspace,
|
|||||||
PMIX_DESTRUCT(&pbkt);
|
PMIX_DESTRUCT(&pbkt);
|
||||||
return rc;
|
return rc;
|
||||||
}
|
}
|
||||||
|
/* don't store blobs to the sm dstore from local clients */
|
||||||
|
if (_my_client(proc.nspace, proc.rank)) {
|
||||||
|
bo->bytes = pbkt.base_ptr;
|
||||||
|
bo->size = pbkt.bytes_used; // restore the incoming data
|
||||||
|
pbkt.base_ptr = NULL;
|
||||||
|
PMIX_DESTRUCT(&pbkt);
|
||||||
|
return PMIX_SUCCESS;
|
||||||
|
}
|
||||||
/* unpack the remaining values until we hit the end of the buffer */
|
/* unpack the remaining values until we hit the end of the buffer */
|
||||||
cnt = 1;
|
cnt = 1;
|
||||||
kv = PMIX_NEW(pmix_kval_t);
|
kv = PMIX_NEW(pmix_kval_t);
|
||||||
PMIX_BFROPS_UNPACK(rc, peer, &pbkt, kv, &cnt, PMIX_KVAL);
|
PMIX_BFROPS_UNPACK(rc, peer, &pbkt, kv, &cnt, PMIX_KVAL);
|
||||||
while (PMIX_SUCCESS == rc) {
|
while (PMIX_SUCCESS == rc) {
|
||||||
/* don't store blobs to the sm dstore from local clients */
|
|
||||||
if (_my_client(proc.nspace, proc.rank)) {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
/* store this in the hash table */
|
/* store this in the hash table */
|
||||||
PMIX_GDS_STORE_KV(rc, pmix_globals.mypeer, &proc, PMIX_REMOTE, kv);
|
PMIX_GDS_STORE_KV(rc, pmix_globals.mypeer, &proc, PMIX_REMOTE, kv);
|
||||||
if (PMIX_SUCCESS != rc) {
|
if (PMIX_SUCCESS != rc) {
|
||||||
|
@ -106,6 +106,7 @@ static int init_server(void)
|
|||||||
/* parse the URI to get the server's name */
|
/* parse the URI to get the server's name */
|
||||||
if (ORTE_SUCCESS != (rc = orte_rml_base_parse_uris(server, &orte_pmix_server_globals.server, NULL))) {
|
if (ORTE_SUCCESS != (rc = orte_rml_base_parse_uris(server, &orte_pmix_server_globals.server, NULL))) {
|
||||||
ORTE_ERROR_LOG(rc);
|
ORTE_ERROR_LOG(rc);
|
||||||
|
free(server);
|
||||||
return rc;
|
return rc;
|
||||||
}
|
}
|
||||||
/* setup our route to the server */
|
/* setup our route to the server */
|
||||||
@ -116,12 +117,10 @@ static int init_server(void)
|
|||||||
if (OPAL_SUCCESS != (rc = opal_pmix.store_local(&orte_pmix_server_globals.server, &val))) {
|
if (OPAL_SUCCESS != (rc = opal_pmix.store_local(&orte_pmix_server_globals.server, &val))) {
|
||||||
ORTE_ERROR_LOG(rc);
|
ORTE_ERROR_LOG(rc);
|
||||||
val.key = NULL;
|
val.key = NULL;
|
||||||
val.data.string = NULL;
|
|
||||||
OBJ_DESTRUCT(&val);
|
OBJ_DESTRUCT(&val);
|
||||||
return rc;
|
return rc;
|
||||||
}
|
}
|
||||||
val.key = NULL;
|
val.key = NULL;
|
||||||
val.data.string = NULL;
|
|
||||||
OBJ_DESTRUCT(&val);
|
OBJ_DESTRUCT(&val);
|
||||||
|
|
||||||
/* check if we are to wait for the server to start - resolves
|
/* check if we are to wait for the server to start - resolves
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user