Skip to content

osc/rdma: fix coverity issues #946

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 26, 2015
Merged

osc/rdma: fix coverity issues #946

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
16 changes: 0 additions & 16 deletions ompi/mca/osc/rdma/osc_rdma_accumulate.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))) {
if (NULL == request) {
OMPI_OSC_RDMA_REQUEST_ALLOC(module, peer, request);
if (NULL == request) {
return OMPI_ERR_OUT_OF_RESOURCE;
}
request->internal = true;
request->type = result_datatype ? OMPI_OSC_RDMA_TYPE_GET_ACC : OMPI_OSC_RDMA_TYPE_ACC;
}
Expand Down Expand Up @@ -403,10 +400,6 @@ static inline int ompi_osc_rdma_gacc_master (ompi_osc_rdma_sync_t *sync, const v

/* execute the get */
OMPI_OSC_RDMA_REQUEST_ALLOC(module, peer, subreq);
if (NULL == subreq) {
ompi_osc_rdma_progress (module);
continue;
}
subreq->internal = true;
subreq->parent_request = request;
if (request) {
Expand Down Expand Up @@ -597,9 +590,6 @@ static inline int cas_rdma (ompi_osc_rdma_sync_t *sync, const void *source_buffe
int ret;

OMPI_OSC_RDMA_REQUEST_ALLOC(module, peer, request);
if (NULL == request) {
return OMPI_ERR_OUT_OF_RESOURCE;
}

request->internal = true;
request->type = OMPI_OSC_RDMA_TYPE_CSWAP;
Expand Down Expand Up @@ -806,9 +796,6 @@ int ompi_osc_rdma_rget_accumulate (const void *origin_addr, int origin_count,
win->w_name));

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,
result_count, result_datatype, peer, target_rank, target_disp,
Expand Down Expand Up @@ -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));

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,
NULL, peer, target_rank, target_disp, target_count, target_datatype,
Expand Down
13 changes: 0 additions & 13 deletions ompi/mca/osc/rdma/osc_rdma_comm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,10 +199,6 @@ static int ompi_osc_rdma_master_noncontig (ompi_osc_rdma_sync_t *sync, void *loc
/* execute the get */
if (!subreq && alloc_reqs) {
OMPI_OSC_RDMA_REQUEST_ALLOC(module, peer, subreq);
if (NULL == subreq) {
ompi_osc_rdma_progress (module);
continue;
}
subreq->internal = true;
subreq->type = OMPI_OSC_RDMA_TYPE_RDMA;
subreq->parent_request = request;
Expand Down Expand Up @@ -285,9 +281,6 @@ static inline int ompi_osc_rdma_master (ompi_osc_rdma_sync_t *sync, void *local_
if (NULL == request && alloc_reqs) {
ompi_osc_rdma_module_t *module = sync->module;
OMPI_OSC_RDMA_REQUEST_ALLOC(module, peer, request);
if (NULL == request) {
return OMPI_ERR_OUT_OF_RESOURCE;
}
request->internal = true;
request->type = OMPI_OSC_RDMA_TYPE_RDMA;
}
Expand Down Expand Up @@ -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));

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;

Expand Down Expand Up @@ -856,9 +846,6 @@ int ompi_osc_rdma_rget (void *origin_addr, int origin_count, struct ompi_datatyp
source_datatype->name, win->w_name));

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;
ret = ompi_osc_rdma_get_w_req (sync, origin_addr, origin_count, origin_datatype, peer,
Expand Down