ports/openmpi
ports/openmpi
1
1
Форкнуть 0
Код Релизы Активность

osc/rdma: fix coverity issues

Просмотр исходного кода 
Fixes CID 1324730, 1327429, 1324728, 1196633, 1324731, 1324727, and
1196632: Logically dead code

OMPI_OSC_RDMA_REQUEST_ALLOC can never return a NULL request. Removed
unnecessary NULL checks.

Signed-off-by: Nathan Hjelm <hjelmn@me.com>
Этот коммит содержится в:
Nathan Hjelm 2015-09-26 12:42:03 -06:00
родитель 016badac2c
Коммит 552e1b59a5
2 изменённых файлов: 0 добавлений и 29 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

16
ompi/mca/osc/rdma/osc_rdma_accumulate.c
Просмотреть файл

@ -282,9 +282,6 @@ static inline int ompi_osc_rdma_gacc_master (ompi_osc_rdma_sync_t *sync, const v
(target_datatype->super.size * target_count <= acc_limit))) { (target_datatype->super.size * target_count <= acc_limit))) {
if (NULL == request) { if (NULL == request) {
OMPI_OSC_RDMA_REQUEST_ALLOC(module, peer, request); OMPI_OSC_RDMA_REQUEST_ALLOC(module, peer, request);
if (NULL == request) {
return OMPI_ERR_OUT_OF_RESOURCE;
}
request->internal = true; request->internal = true;
request->type = result_datatype ? OMPI_OSC_RDMA_TYPE_GET_ACC : OMPI_OSC_RDMA_TYPE_ACC; request->type = result_datatype ? OMPI_OSC_RDMA_TYPE_GET_ACC : OMPI_OSC_RDMA_TYPE_ACC;
} }
@ -403,10 +400,6 @@ static inline int ompi_osc_rdma_gacc_master (ompi_osc_rdma_sync_t *sync, const v
/* execute the get */ /* execute the get */
OMPI_OSC_RDMA_REQUEST_ALLOC(module, peer, subreq); OMPI_OSC_RDMA_REQUEST_ALLOC(module, peer, subreq);
if (NULL == subreq) {
ompi_osc_rdma_progress (module);
continue;
}
subreq->internal = true; subreq->internal = true;
subreq->parent_request = request; subreq->parent_request = request;
if (request) { if (request) {
@ -597,9 +590,6 @@ static inline int cas_rdma (ompi_osc_rdma_sync_t *sync, const void *source_buffe
int ret; int ret;
OMPI_OSC_RDMA_REQUEST_ALLOC(module, peer, request); OMPI_OSC_RDMA_REQUEST_ALLOC(module, peer, request);
if (NULL == request) {
return OMPI_ERR_OUT_OF_RESOURCE;
}
request->internal = true; request->internal = true;
request->type = OMPI_OSC_RDMA_TYPE_CSWAP; request->type = OMPI_OSC_RDMA_TYPE_CSWAP;
@ -806,9 +796,6 @@ int ompi_osc_rdma_rget_accumulate (const void *origin_addr, int origin_count,
win->w_name)); win->w_name));
OMPI_OSC_RDMA_REQUEST_ALLOC(module, peer, rdma_request); OMPI_OSC_RDMA_REQUEST_ALLOC(module, peer, rdma_request);
if (OPAL_UNLIKELY(NULL == rdma_request)) {
return OMPI_ERR_OUT_OF_RESOURCE;
}
ret = ompi_osc_rdma_rget_accumulate_internal (sync, origin_addr, origin_count, origin_datatype, result_addr, ret = ompi_osc_rdma_rget_accumulate_internal (sync, origin_addr, origin_count, origin_datatype, result_addr,
result_count, result_datatype, peer, target_rank, target_disp, result_count, result_datatype, peer, target_rank, target_disp,
@ -865,9 +852,6 @@ int ompi_osc_rdma_raccumulate (const void *origin_addr, int origin_count,
(unsigned long) target_disp, target_count, target_datatype->name, op->o_name, win->w_name)); (unsigned long) target_disp, target_count, target_datatype->name, op->o_name, win->w_name));
OMPI_OSC_RDMA_REQUEST_ALLOC(module, peer, rdma_request); OMPI_OSC_RDMA_REQUEST_ALLOC(module, peer, rdma_request);
if (OPAL_UNLIKELY(NULL == rdma_request)) {
return OMPI_ERR_OUT_OF_RESOURCE;
}
ret = ompi_osc_rdma_rget_accumulate_internal (sync, origin_addr, origin_count, origin_datatype, NULL, 0, ret = ompi_osc_rdma_rget_accumulate_internal (sync, origin_addr, origin_count, origin_datatype, NULL, 0,
NULL, peer, target_rank, target_disp, target_count, target_datatype, NULL, peer, target_rank, target_disp, target_count, target_datatype,

13
ompi/mca/osc/rdma/osc_rdma_comm.c
Просмотреть файл

@ -199,10 +199,6 @@ static int ompi_osc_rdma_master_noncontig (ompi_osc_rdma_sync_t *sync, void *loc
/* execute the get */ /* execute the get */
if (!subreq && alloc_reqs) { if (!subreq && alloc_reqs) {
OMPI_OSC_RDMA_REQUEST_ALLOC(module, peer, subreq); OMPI_OSC_RDMA_REQUEST_ALLOC(module, peer, subreq);
if (NULL == subreq) {
ompi_osc_rdma_progress (module);
continue;
}
subreq->internal = true; subreq->internal = true;
subreq->type = OMPI_OSC_RDMA_TYPE_RDMA; subreq->type = OMPI_OSC_RDMA_TYPE_RDMA;
subreq->parent_request = request; subreq->parent_request = request;
@ -285,9 +281,6 @@ static inline int ompi_osc_rdma_master (ompi_osc_rdma_sync_t *sync, void *local_
if (NULL == request && alloc_reqs) { if (NULL == request && alloc_reqs) {
ompi_osc_rdma_module_t *module = sync->module; ompi_osc_rdma_module_t *module = sync->module;
OMPI_OSC_RDMA_REQUEST_ALLOC(module, peer, request); OMPI_OSC_RDMA_REQUEST_ALLOC(module, peer, request);
if (NULL == request) {
return OMPI_ERR_OUT_OF_RESOURCE;
}
request->internal = true; request->internal = true;
request->type = OMPI_OSC_RDMA_TYPE_RDMA; request->type = OMPI_OSC_RDMA_TYPE_RDMA;
} }
@ -794,9 +787,6 @@ int ompi_osc_rdma_rput (const void *origin_addr, int origin_count, struct ompi_d
target_datatype->name, win->w_name)); target_datatype->name, win->w_name));
OMPI_OSC_RDMA_REQUEST_ALLOC(module, peer, rdma_request); OMPI_OSC_RDMA_REQUEST_ALLOC(module, peer, rdma_request);
if (NULL == rdma_request) {
return OMPI_ERR_OUT_OF_RESOURCE;
}
rdma_request->type = OMPI_OSC_RDMA_TYPE_PUT; rdma_request->type = OMPI_OSC_RDMA_TYPE_PUT;
@ -856,9 +846,6 @@ int ompi_osc_rdma_rget (void *origin_addr, int origin_count, struct ompi_datatyp
source_datatype->name, win->w_name)); source_datatype->name, win->w_name));
OMPI_OSC_RDMA_REQUEST_ALLOC(module, peer, rdma_request); OMPI_OSC_RDMA_REQUEST_ALLOC(module, peer, rdma_request);
if (NULL == rdma_request) {
return OMPI_ERR_OUT_OF_RESOURCE;
}
rdma_request->type = OMPI_OSC_RDMA_TYPE_GET; rdma_request->type = OMPI_OSC_RDMA_TYPE_GET;
ret = ompi_osc_rdma_get_w_req (sync, origin_addr, origin_count, origin_datatype, peer, ret = ompi_osc_rdma_get_w_req (sync, origin_addr, origin_count, origin_datatype, peer,