Merge pull request #11569 from MamziB/mamzi/req-free

janjust · web-flow · commit 3676f54598fe · 2023-04-11T08:25:09.000-05:00
UCC/HCOLL: return req null in request free
diff --git a/ompi/mca/coll/hcoll/coll_hcoll_rte.c b/ompi/mca/coll/hcoll/coll_hcoll_rte.c
@@ -331,7 +331,7 @@ request_free(struct ompi_request_t **ompi_req)
         return OMPI_ERROR;
     }
     coll_handle_free(req);
-    *ompi_req = &ompi_request_empty;
+    *ompi_req = MPI_REQUEST_NULL;
     return OMPI_SUCCESS;
 }
 
diff --git a/ompi/mca/coll/ucc/coll_ucc_module.c b/ompi/mca/coll/ucc/coll_ucc_module.c
@@ -587,7 +587,7 @@ int mca_coll_ucc_req_free(struct ompi_request_t **ompi_req)
 {
     opal_free_list_return (&mca_coll_ucc_component.requests,
                            (opal_free_list_item_t *)(*ompi_req));
-    *ompi_req = &ompi_request_empty;
+    *ompi_req = MPI_REQUEST_NULL;
     return OMPI_SUCCESS;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -331,7 +331,7 @@ request_free(struct ompi_request_t **ompi_req)`
`331`	`331`	`return OMPI_ERROR;`
`332`	`332`	`}`
`333`	`333`	`coll_handle_free(req);`
`334`		`- *ompi_req = &ompi_request_empty;`
	`334`	`+ *ompi_req = MPI_REQUEST_NULL;`
`335`	`335`	`return OMPI_SUCCESS;`
`336`	`336`	`}`
`337`	`337`
Original file line number	Diff line number	Diff line change
`@@ -587,7 +587,7 @@ int mca_coll_ucc_req_free(struct ompi_request_t **ompi_req)`
`587`	`587`	`{`
`588`	`588`	`opal_free_list_return (&mca_coll_ucc_component.requests,`
`589`	`589`	`(opal_free_list_item_t )(ompi_req));`
`590`		`- *ompi_req = &ompi_request_empty;`
	`590`	`+ *ompi_req = MPI_REQUEST_NULL;`
`591`	`591`	`return OMPI_SUCCESS;`
`592`	`592`	`}`
`593`	`593`