Skip to content

more ompi coverity fixes #950

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 2 commits into from
Sep 28, 2015
Merged

more ompi coverity fixes #950

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6611c00
Fix coverity warnings
hjelmn Sep 28, 2015
6b83fa2
ompi/comm: fix coverity errors
hjelmn Sep 28, 2015
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
11 changes: 7 additions & 4 deletions ompi/communicator/comm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -565,7 +565,11 @@ int ompi_comm_split( ompi_communicator_t* comm, int color, int key,
}
}

ompi_group_incl(comm->c_local_group, my_size, lranks, &local_group);
rc = ompi_group_incl(comm->c_local_group, my_size, lranks, &local_group);
if (OMPI_SUCCESS != rc) {
goto exit;
}

ompi_group_increment_proc_count(local_group);

mode = OMPI_COMM_CID_INTER;
Expand All @@ -588,8 +592,7 @@ int ompi_comm_split( ompi_communicator_t* comm, int color, int key,
comm->error_handler,/* error handler */
pass_on_topo,
local_group, /* local group */
remote_group /* remote group */
);
remote_group); /* remote group */

if ( NULL == newcomp ) {
rc = MPI_ERR_INTERN;
Expand Down Expand Up @@ -918,7 +921,7 @@ ompi_comm_split_type(ompi_communicator_t *comm,
NULL, /* local group */
NULL ); /* remote group */

if ( NULL == newcomm ) {
if ( NULL == newcomp ) {
rc = MPI_ERR_INTERN;
goto exit;
}
Expand Down
10 changes: 5 additions & 5 deletions ompi/mca/pml/ob1/pml_ob1_recvreq.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1059,16 +1059,16 @@ static inline void append_recv_req_to_queue(opal_list_t *queue,

opal_list_append(queue, (opal_list_item_t*)req);

#if OMPI_WANT_PERUSE
/**
* We don't want to generate this kind of event for MPI_Probe. Hopefully,
* the compiler will optimize out the empty if loop in the case where PERUSE
* support is not required by the user.
* We don't want to generate this kind of event for MPI_Probe.
*/
if(req->req_recv.req_base.req_type != MCA_PML_REQUEST_PROBE ||
req->req_recv.req_base.req_type != MCA_PML_REQUEST_MPROBE) {
if (req->req_recv.req_base.req_type != MCA_PML_REQUEST_PROBE &&
req->req_recv.req_base.req_type != MCA_PML_REQUEST_MPROBE) {
PERUSE_TRACE_COMM_EVENT(PERUSE_COMM_REQ_INSERT_IN_POSTED_Q,
&(req->req_recv.req_base), PERUSE_RECV);
}
#endif
}

/*
Expand Down