Skip to content

ompi_comm_enable: always OBJ_RELEASE new_comm if an error occurs #459

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

Closed
wants to merge 1 commit into from
Closed

ompi_comm_enable: always OBJ_RELEASE new_comm if an error occurs #459

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
6 changes: 0 additions & 6 deletions ompi/mca/topo/base/topo_base_cart_create.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,12 +172,6 @@ int mca_topo_base_cart_create(mca_topo_base_module_t *topo,
if (OMPI_SUCCESS != ret) {
/* something wrong happened during setting the communicator */
free(topo_procs);
OBJ_RELEASE(cart);
if (MPI_COMM_NULL != new_comm) {
new_comm->c_topo = NULL;
new_comm->c_flags &= ~OMPI_COMM_CART;
ompi_comm_free (&new_comm);
}
return ret;
}

Expand Down
19 changes: 0 additions & 19 deletions ompi/mca/topo/base/topo_base_dist_graph_create.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,25 +335,6 @@ int mca_topo_base_dist_graph_create(mca_topo_base_module_t* module,
ret = ompi_comm_enable(comm_old, new_comm,
rank, num_procs, topo_procs);
if (OMPI_SUCCESS != ret) {
if ( NULL != topo->in ) {
free(topo->in);
}
if ( NULL != topo->out ) {
free(topo->out);
}
if ( NULL != topo->inw ) {
free(topo->inw);
}
if ( NULL != topo->outw ) {
free(topo->outw);
}
if (MPI_COMM_NULL != new_comm) {
new_comm->c_topo->mtc.dist_graph = NULL;
new_comm->c_topo = NULL;
new_comm->c_flags &= ~OMPI_COMM_DIST_GRAPH;
ompi_comm_free (&new_comm);
}
free(topo);
free(topo_procs);
return ret;
}
Expand Down
6 changes: 0 additions & 6 deletions ompi/mca/topo/base/topo_base_graph_create.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,12 +132,6 @@ int mca_topo_base_graph_create(mca_topo_base_module_t *topo,
new_rank, num_procs, topo_procs);
if (OMPI_SUCCESS != ret) {
free(topo_procs);
OBJ_RELEASE(graph);
if (MPI_COMM_NULL != new_comm) {
new_comm->c_topo = NULL;
new_comm->c_flags &= ~OMPI_COMM_GRAPH;
ompi_comm_free (&new_comm);
}
return ret;
}

Expand Down