Merge pull request #11200 from drwootton/coll_adapt_missing_lock

bosilca · web-flow · commit 658f721f1783 · 2022-12-12T21:07:28.000-05:00
Fix missing lock release in ompi_coll_adapt_ibcast_generic: Coverity CID 1498641
diff --git a/ompi/mca/coll/adapt/coll_adapt_ibcast.c b/ompi/mca/coll/adapt/coll_adapt_ibcast.c
@@ -558,11 +558,11 @@ int ompi_coll_adapt_ibcast_generic(void *buff, int count, struct ompi_datatype_t
                 MCA_PML_CALL(irecv
                              (recv_buff, recv_count, datatype, context->peer,
                               con->ibcast_tag - i, comm, &recv_req));
+            /* Set receive callback */
+            OPAL_THREAD_UNLOCK(mutex);
             if (MPI_SUCCESS != err) {
                 return err;
             }
-            /* Set receive callback */
-            OPAL_THREAD_UNLOCK(mutex);
             ompi_request_set_callback(recv_req, recv_cb, context);
             OPAL_THREAD_LOCK(mutex);
         }

Original file line number	Diff line number	Diff line change
`@@ -558,11 +558,11 @@ int ompi_coll_adapt_ibcast_generic(void *buff, int count, struct ompi_datatype_t`
`558`	`558`	`MCA_PML_CALL(irecv`
`559`	`559`	`(recv_buff, recv_count, datatype, context->peer,`
`560`	`560`	`con->ibcast_tag - i, comm, &recv_req));`
	`561`	`+ /* Set receive callback */`
	`562`	`+ OPAL_THREAD_UNLOCK(mutex);`
`561`	`563`	`if (MPI_SUCCESS != err) {`
`562`	`564`	`return err;`
`563`	`565`	`}`
`564`		`- /* Set receive callback */`
`565`		`- OPAL_THREAD_UNLOCK(mutex);`
`566`	`566`	`ompi_request_set_callback(recv_req, recv_cb, context);`
`567`	`567`	`OPAL_THREAD_LOCK(mutex);`
`568`	`568`	`}`