Merge pull request #899 from rhc54/topic/cov
Silence some warnings and address Coverity issues
Этот коммит содержится в:
Коммит
55d40910ee
@ -91,7 +91,7 @@ int mca_btl_tcp_add_procs( struct mca_btl_base_module_t* btl,
|
|||||||
|
|
||||||
OPAL_THREAD_LOCK(&tcp_proc->proc_lock);
|
OPAL_THREAD_LOCK(&tcp_proc->proc_lock);
|
||||||
|
|
||||||
for (int j = 0 ; j < tcp_proc->proc_endpoint_count ; ++j) {
|
for (int j = 0 ; j < (int)tcp_proc->proc_endpoint_count ; ++j) {
|
||||||
tcp_endpoint = tcp_proc->proc_endpoints[j];
|
tcp_endpoint = tcp_proc->proc_endpoints[j];
|
||||||
if (tcp_endpoint->endpoint_btl == tcp_btl) {
|
if (tcp_endpoint->endpoint_btl == tcp_btl) {
|
||||||
existing_found = true;
|
existing_found = true;
|
||||||
|
@ -743,7 +743,6 @@ mca_btl_tcp_proc_t* mca_btl_tcp_proc_lookup(const opal_process_name_t *name)
|
|||||||
if (OPAL_UNLIKELY(NULL == proc)) {
|
if (OPAL_UNLIKELY(NULL == proc)) {
|
||||||
mca_btl_base_endpoint_t *endpoint;
|
mca_btl_base_endpoint_t *endpoint;
|
||||||
opal_proc_t *opal_proc;
|
opal_proc_t *opal_proc;
|
||||||
int rc;
|
|
||||||
|
|
||||||
BTL_VERBOSE(("adding tcp proc for unknown peer {.jobid = 0x%x, .vpid = 0x%x}",
|
BTL_VERBOSE(("adding tcp proc for unknown peer {.jobid = 0x%x, .vpid = 0x%x}",
|
||||||
name->jobid, name->vpid));
|
name->jobid, name->vpid));
|
||||||
@ -754,7 +753,7 @@ mca_btl_tcp_proc_t* mca_btl_tcp_proc_lookup(const opal_process_name_t *name)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* try adding this proc to each btl until */
|
/* try adding this proc to each btl until */
|
||||||
for (int i = 0 ; i < mca_btl_tcp_component.tcp_num_btls ; ++i) {
|
for (int i = 0 ; i < (int)mca_btl_tcp_component.tcp_num_btls ; ++i) {
|
||||||
endpoint = NULL;
|
endpoint = NULL;
|
||||||
(void) mca_btl_tcp_add_procs (&mca_btl_tcp_component.tcp_btls[i]->super, 1, &opal_proc,
|
(void) mca_btl_tcp_add_procs (&mca_btl_tcp_component.tcp_btls[i]->super, 1, &opal_proc,
|
||||||
&endpoint, NULL);
|
&endpoint, NULL);
|
||||||
|
@ -70,10 +70,12 @@ static void lookup_cbfunc(int status, opal_list_t *data, void *cbdata)
|
|||||||
cd->status = status;
|
cd->status = status;
|
||||||
if (OPAL_SUCCESS == status && NULL != data) {
|
if (OPAL_SUCCESS == status && NULL != data) {
|
||||||
opal_pmix_pdata_t *p = (opal_pmix_pdata_t*)opal_list_get_first(data);
|
opal_pmix_pdata_t *p = (opal_pmix_pdata_t*)opal_list_get_first(data);
|
||||||
if (NULL != p && p->value.type == cd->pdat->value.type) {
|
if (NULL != p) {
|
||||||
(void)opal_value_xfer(&cd->pdat->value, &p->value);
|
cd->pdat->proc = p->proc;
|
||||||
|
if (p->value.type == cd->pdat->value.type) {
|
||||||
|
(void)opal_value_xfer(&cd->pdat->value, &p->value);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
cd->pdat->proc = p->proc;
|
|
||||||
}
|
}
|
||||||
cd->active = false;
|
cd->active = false;
|
||||||
}
|
}
|
||||||
|
@ -594,7 +594,7 @@ static void recv_handler(int sd, short flg, void *cbdata)
|
|||||||
}
|
}
|
||||||
CLOSE_THE_SOCKET(sd);
|
CLOSE_THE_SOCKET(sd);
|
||||||
ui64 = (uint64_t*)(&peer->name);
|
ui64 = (uint64_t*)(&peer->name);
|
||||||
opal_hash_table_set_value_uint64(&mca_oob_tcp_module.peers, (*ui64), NULL);
|
(void)opal_hash_table_set_value_uint64(&mca_oob_tcp_module.peers, (*ui64), NULL);
|
||||||
OBJ_RELEASE(peer);
|
OBJ_RELEASE(peer);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user