SQUASHME: change name to ompi_coll_base_add_release_arrays_cb

hppritcha · hppritcha · commit 9095f1f309d5 · 2025-11-26T10:31:33.000-07:00
Signed-off-by: Howard Pritchard &lt;howardp@lanl.gov&gt;
diff --git a/ompi/mca/coll/base/coll_base_util.c b/ompi/mca/coll/base/coll_base_util.c
@@ -349,7 +349,7 @@ int ompi_coll_base_retain_datatypes_w( ompi_request_t *req,
     return OMPI_SUCCESS;
 }
 
-int ompi_coll_base_run_release_arrays_cb(ompi_request_t *req)
+int ompi_coll_base_add_release_arrays_cb(ompi_request_t *req)
 {
     ompi_coll_base_nbc_request_t *request = (ompi_coll_base_nbc_request_t *)req;
 
diff --git a/ompi/mca/coll/base/coll_base_util.h b/ompi/mca/coll/base/coll_base_util.h
@@ -232,7 +232,7 @@ int ompi_coll_base_retain_datatypes_w( ompi_request_t *request,
  * set in release_arrays.  Not set if a callback is already
  * associated with the request.
  */
-int ompi_coll_base_run_release_arrays_cb(ompi_request_t *request);
+int ompi_coll_base_add_release_arrays_cb(ompi_request_t *request);
 
 /* File reading function */
 int ompi_coll_base_file_getnext_long(FILE *fptr, int *fileline, long* val);
diff --git a/ompi/mpi/fortran/mpif-h/allgatherv_init_f.c b/ompi/mpi/fortran/mpif-h/allgatherv_init_f.c
@@ -110,7 +110,7 @@ void ompi_allgatherv_init_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendty
         if ((void *)recvcounts != (void *)OMPI_ARRAY_NAME_CONVERT(recvcounts)) {
             ompi_coll_base_append_array_to_release(c_request, OMPI_ARRAY_NAME_CONVERT(recvcounts));
             ompi_coll_base_append_array_to_release(c_request, OMPI_ARRAY_NAME_CONVERT(displs));
-            ompi_coll_base_run_release_arrays_cb(c_request);
+            ompi_coll_base_add_release_arrays_cb(c_request);
         }
      } else {
         OMPI_ARRAY_FINT_2_INT_CLEANUP(recvcounts);
diff --git a/ompi/mpi/fortran/mpif-h/alltoallv_init_f.c b/ompi/mpi/fortran/mpif-h/alltoallv_init_f.c
@@ -116,7 +116,7 @@ void ompi_alltoallv_init_f(char *sendbuf, MPI_Fint *sendcounts, MPI_Fint *sdispl
             ompi_coll_base_append_array_to_release(c_request, OMPI_ARRAY_NAME_CONVERT(sdispls));
             ompi_coll_base_append_array_to_release(c_request, OMPI_ARRAY_NAME_CONVERT(recvcounts));
             ompi_coll_base_append_array_to_release(c_request, OMPI_ARRAY_NAME_CONVERT(rdispls));
-            ompi_coll_base_run_release_arrays_cb(c_request);
+            ompi_coll_base_add_release_arrays_cb(c_request);
         }
     } else {
         OMPI_ARRAY_FINT_2_INT_CLEANUP(sendcounts);
diff --git a/ompi/mpi/fortran/mpif-h/alltoallw_init_f.c b/ompi/mpi/fortran/mpif-h/alltoallw_init_f.c
@@ -133,7 +133,7 @@ void ompi_alltoallw_init_f(char *sendbuf, MPI_Fint *sendcounts,
                 ompi_coll_base_append_array_to_release(c_request, OMPI_ARRAY_NAME_CONVERT(sdispls));
             }
         }
-        ompi_coll_base_run_release_arrays_cb(c_request);
+        ompi_coll_base_add_release_arrays_cb(c_request);
     } else {
         OMPI_ARRAY_FINT_2_INT_CLEANUP(sendcounts);
         OMPI_ARRAY_FINT_2_INT_CLEANUP(sdispls);
diff --git a/ompi/mpi/fortran/mpif-h/gatherv_init_f.c b/ompi/mpi/fortran/mpif-h/gatherv_init_f.c
@@ -109,7 +109,7 @@ void ompi_gatherv_init_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype,
         if ((void *)recvcounts != (void *)OMPI_ARRAY_NAME_CONVERT(recvcounts)) {
             ompi_coll_base_append_array_to_release(c_request, OMPI_ARRAY_NAME_CONVERT(recvcounts));
             ompi_coll_base_append_array_to_release(c_request, OMPI_ARRAY_NAME_CONVERT(displs));
-            ompi_coll_base_run_release_arrays_cb(c_request);
+            ompi_coll_base_add_release_arrays_cb(c_request);
         }
      } else {
         OMPI_ARRAY_FINT_2_INT_CLEANUP(recvcounts);
diff --git a/ompi/mpi/fortran/mpif-h/iallgatherv_f.c b/ompi/mpi/fortran/mpif-h/iallgatherv_f.c
@@ -112,7 +112,7 @@ void ompi_iallgatherv_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype,
         if ((void *)recvcounts != (void *)OMPI_ARRAY_NAME_CONVERT(recvcounts)) {
             ompi_coll_base_append_array_to_release(c_request, OMPI_ARRAY_NAME_CONVERT(recvcounts));
             ompi_coll_base_append_array_to_release(c_request, OMPI_ARRAY_NAME_CONVERT(displs));
-            ompi_coll_base_run_release_arrays_cb(c_request);
+            ompi_coll_base_add_release_arrays_cb(c_request);
         }
     }
 }
diff --git a/ompi/mpi/fortran/mpif-h/ialltoallv_f.c b/ompi/mpi/fortran/mpif-h/ialltoallv_f.c
@@ -120,7 +120,7 @@ void ompi_ialltoallv_f(char *sendbuf, MPI_Fint *sendcounts, MPI_Fint *sdispls,
             ompi_coll_base_append_array_to_release(c_request, OMPI_ARRAY_NAME_CONVERT(sdispls));
             ompi_coll_base_append_array_to_release(c_request, OMPI_ARRAY_NAME_CONVERT(recvcounts));
             ompi_coll_base_append_array_to_release(c_request, OMPI_ARRAY_NAME_CONVERT(rdispls));
-            ompi_coll_base_run_release_arrays_cb(c_request);
+            ompi_coll_base_add_release_arrays_cb(c_request);
         }
     }
 }
diff --git a/ompi/mpi/fortran/mpif-h/ialltoallw_f.c b/ompi/mpi/fortran/mpif-h/ialltoallw_f.c
@@ -140,6 +140,6 @@ void ompi_ialltoallw_f(char *sendbuf, MPI_Fint *sendcounts,
         }
         ompi_coll_base_append_array_to_release(c_request, c_recvtypes);
         ompi_coll_base_append_array_to_release(c_request, c_sendtypes);
-        ompi_coll_base_run_release_arrays_cb(c_request);
+        ompi_coll_base_add_release_arrays_cb(c_request);
     }
 }
diff --git a/ompi/mpi/fortran/mpif-h/igatherv_f.c b/ompi/mpi/fortran/mpif-h/igatherv_f.c
@@ -111,7 +111,7 @@ void ompi_igatherv_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype,
         if ((void *)recvcounts != (void *)OMPI_ARRAY_NAME_CONVERT(recvcounts)) {
             ompi_coll_base_append_array_to_release(c_request, OMPI_ARRAY_NAME_CONVERT(recvcounts));
             ompi_coll_base_append_array_to_release(c_request, OMPI_ARRAY_NAME_CONVERT(displs));
-            ompi_coll_base_run_release_arrays_cb(c_request);
+            ompi_coll_base_add_release_arrays_cb(c_request);
         }
     }
 }
diff --git a/ompi/mpi/fortran/mpif-h/ineighbor_allgatherv_f.c b/ompi/mpi/fortran/mpif-h/ineighbor_allgatherv_f.c
@@ -111,7 +111,7 @@ void ompi_ineighbor_allgatherv_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *s
         if ((void *)recvcounts != (void *)OMPI_ARRAY_NAME_CONVERT(recvcounts)) {
             ompi_coll_base_append_array_to_release(c_request, OMPI_ARRAY_NAME_CONVERT(recvcounts));
             ompi_coll_base_append_array_to_release(c_request, OMPI_ARRAY_NAME_CONVERT(displs));
-            ompi_coll_base_run_release_arrays_cb(c_request);
+            ompi_coll_base_add_release_arrays_cb(c_request);
         }
     } else {
         OMPI_ARRAY_FINT_2_INT_CLEANUP(recvcounts);
diff --git a/ompi/mpi/fortran/mpif-h/ineighbor_alltoallv_f.c b/ompi/mpi/fortran/mpif-h/ineighbor_alltoallv_f.c
@@ -122,6 +122,6 @@ void ompi_ineighbor_alltoallv_f(char *sendbuf, MPI_Fint *sendcounts, MPI_Fint *s
         ompi_coll_base_append_array_to_release(c_request, OMPI_ARRAY_NAME_CONVERT(sdispls));
         ompi_coll_base_append_array_to_release(c_request, OMPI_ARRAY_NAME_CONVERT(recvcounts));
         ompi_coll_base_append_array_to_release(c_request, OMPI_ARRAY_NAME_CONVERT(rdispls));
-        ompi_coll_base_run_release_arrays_cb(c_request);
+        ompi_coll_base_add_release_arrays_cb(c_request);
     }
 }
diff --git a/ompi/mpi/fortran/mpif-h/ineighbor_alltoallw_f.c b/ompi/mpi/fortran/mpif-h/ineighbor_alltoallw_f.c
@@ -124,6 +124,6 @@ void ompi_ineighbor_alltoallw_f(char *sendbuf, MPI_Fint *sendcounts,
         ompi_coll_base_append_array_to_release(c_request, OMPI_ARRAY_NAME_CONVERT(recvcounts));
         ompi_coll_base_append_array_to_release(c_request, c_sendtypes);
         ompi_coll_base_append_array_to_release(c_request, c_recvtypes);
-        ompi_coll_base_run_release_arrays_cb(c_request);
+        ompi_coll_base_add_release_arrays_cb(c_request);
     }
 }
diff --git a/ompi/mpi/fortran/mpif-h/ireduce_scatter_f.c b/ompi/mpi/fortran/mpif-h/ireduce_scatter_f.c
@@ -103,6 +103,6 @@ void ompi_ireduce_scatter_f(char *sendbuf, char *recvbuf,
         OMPI_ARRAY_FINT_2_INT_CLEANUP(recvcounts);
     } else {
         ompi_coll_base_append_array_to_release(c_request, recvcounts);
-        ompi_coll_base_run_release_arrays_cb(c_request);
+        ompi_coll_base_add_release_arrays_cb(c_request);
     }
 }
diff --git a/ompi/mpi/fortran/mpif-h/iscatterv_f.c b/ompi/mpi/fortran/mpif-h/iscatterv_f.c
@@ -113,7 +113,7 @@ void ompi_iscatterv_f(char *sendbuf, MPI_Fint *sendcounts,
         if ((void *)sendcounts != (void *)OMPI_ARRAY_NAME_CONVERT(sendcounts)) {
             ompi_coll_base_append_array_to_release(c_request, OMPI_ARRAY_NAME_CONVERT(sendcounts));
             ompi_coll_base_append_array_to_release(c_request, OMPI_ARRAY_NAME_CONVERT(displs));
-            ompi_coll_base_run_release_arrays_cb(c_request);
+            ompi_coll_base_add_release_arrays_cb(c_request);
         }
     }
 }
diff --git a/ompi/mpi/fortran/mpif-h/neighbor_allgatherv_init_f.c b/ompi/mpi/fortran/mpif-h/neighbor_allgatherv_init_f.c
@@ -113,7 +113,7 @@ void ompi_neighbor_allgatherv_init_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fin
         if ((void *)recvcounts != (void *)OMPI_ARRAY_NAME_CONVERT(recvcounts)) {
             ompi_coll_base_append_array_to_release(c_request, OMPI_ARRAY_NAME_CONVERT(recvcounts));
             ompi_coll_base_append_array_to_release(c_request, OMPI_ARRAY_NAME_CONVERT(displs));
-            ompi_coll_base_run_release_arrays_cb(c_request);
+            ompi_coll_base_add_release_arrays_cb(c_request);
         }
     } else {
         OMPI_ARRAY_FINT_2_INT_CLEANUP(recvcounts);
diff --git a/ompi/mpi/fortran/mpif-h/neighbor_alltoallv_init_f.c b/ompi/mpi/fortran/mpif-h/neighbor_alltoallv_init_f.c
@@ -119,7 +119,7 @@ void ompi_neighbor_alltoallv_init_f(char *sendbuf, MPI_Fint *sendcounts, MPI_Fin
             ompi_coll_base_append_array_to_release(c_request, OMPI_ARRAY_NAME_CONVERT(sdispls));
             ompi_coll_base_append_array_to_release(c_request, OMPI_ARRAY_NAME_CONVERT(recvcounts));
             ompi_coll_base_append_array_to_release(c_request, OMPI_ARRAY_NAME_CONVERT(rdispls));
-            ompi_coll_base_run_release_arrays_cb(c_request);
+            ompi_coll_base_add_release_arrays_cb(c_request);
         }
     } else {
         OMPI_ARRAY_FINT_2_INT_CLEANUP(sendcounts);
diff --git a/ompi/mpi/fortran/mpif-h/neighbor_alltoallw_init_f.c b/ompi/mpi/fortran/mpif-h/neighbor_alltoallw_init_f.c
@@ -123,7 +123,7 @@ void ompi_neighbor_alltoallw_init_f(char *sendbuf, MPI_Fint *sendcounts,
             ompi_coll_base_append_array_to_release(c_request, OMPI_ARRAY_NAME_CONVERT(sendcounts));
             ompi_coll_base_append_array_to_release(c_request, OMPI_ARRAY_NAME_CONVERT(recvcounts));
         }
-        ompi_coll_base_run_release_arrays_cb(c_request);
+        ompi_coll_base_add_release_arrays_cb(c_request);
     } else {
         OMPI_ARRAY_FINT_2_INT_CLEANUP(sendcounts);
         OMPI_ARRAY_FINT_2_INT_CLEANUP(recvcounts);
diff --git a/ompi/mpi/fortran/mpif-h/reduce_scatter_init_f.c b/ompi/mpi/fortran/mpif-h/reduce_scatter_init_f.c
@@ -103,7 +103,7 @@ void ompi_reduce_scatter_init_f(char *sendbuf, char *recvbuf,
     if (MPI_SUCCESS == c_ierr) {
         *request = PMPI_Request_c2f(c_request);
         ompi_coll_base_append_array_to_release(c_request, OMPI_ARRAY_NAME_CONVERT(recvcounts));
-        ompi_coll_base_run_release_arrays_cb(c_request);
+        ompi_coll_base_add_release_arrays_cb(c_request);
     } else {
         OMPI_ARRAY_FINT_2_INT_CLEANUP(recvcounts);
     }
diff --git a/ompi/mpi/fortran/mpif-h/scatterv_init_f.c b/ompi/mpi/fortran/mpif-h/scatterv_init_f.c
@@ -110,7 +110,7 @@ void ompi_scatterv_init_f(char *sendbuf, MPI_Fint *sendcounts,
         if ((void *)sendcounts != (void *)OMPI_ARRAY_NAME_CONVERT(sendcounts)) {
             ompi_coll_base_append_array_to_release(c_request, OMPI_ARRAY_NAME_CONVERT(sendcounts));
             ompi_coll_base_append_array_to_release(c_request, OMPI_ARRAY_NAME_CONVERT(displs));
-            ompi_coll_base_run_release_arrays_cb(c_request);
+            ompi_coll_base_add_release_arrays_cb(c_request);
         }
      } else {
         OMPI_ARRAY_FINT_2_INT_CLEANUP(sendcounts);
diff --git a/ompi/mpi/fortran/use-mpi-f08/allgatherv_init_ts.c.in b/ompi/mpi/fortran/use-mpi-f08/allgatherv_init_ts.c.in
@@ -98,6 +98,6 @@ PROTOTYPE VOID allgatherv_init(BUFFER_ASYNC x1, COUNT sendcount, DATATYPE sendty
     OMPI_FORTRAN_BIGCOUNT_ARRAY_CLEANUP_NONBLOCKING(recvcounts, tmp_recvcounts, c_request, c_ierr, idx);
     OMPI_FORTRAN_BIGCOUNT_ARRAY_CLEANUP_NONBLOCKING(displs, tmp_displs, c_request, c_ierr, idx);
     if (idx > 0) {
-        ompi_coll_base_run_release_arrays_cb(c_request);
+        ompi_coll_base_add_release_arrays_cb(c_request);
     }
 }
diff --git a/ompi/mpi/fortran/use-mpi-f08/alltoallv_init_ts.c.in b/ompi/mpi/fortran/use-mpi-f08/alltoallv_init_ts.c.in
@@ -86,6 +86,6 @@ PROTOTYPE VOID alltoallv_init(BUFFER_ASYNC x1, COUNT_ARRAY sendcounts, DISP_ARRA
     OMPI_FORTRAN_BIGCOUNT_ARRAY_CLEANUP_NONBLOCKING(recvcounts, tmp_recvcounts, c_request, c_ierr, idx);
     OMPI_FORTRAN_BIGCOUNT_ARRAY_CLEANUP_NONBLOCKING(rdispls, tmp_rdispls, c_request, c_ierr, idx);
     if (idx > 0) {
-        ompi_coll_base_run_release_arrays_cb(c_request);
+        ompi_coll_base_add_release_arrays_cb(c_request);
     }
 }
diff --git a/ompi/mpi/fortran/use-mpi-f08/alltoallw_init_ts.c.in b/ompi/mpi/fortran/use-mpi-f08/alltoallw_init_ts.c.in
@@ -91,7 +91,7 @@ PROTOTYPE VOID alltoallw_init(BUFFER_ASYNC x1, COUNT_ARRAY sendcounts,
             ompi_coll_base_append_array_to_release(c_request, c_sendtypes);
         }
         ompi_coll_base_append_array_to_release(c_request, c_recvtypes);
-        ompi_coll_base_run_release_arrays_cb(c_request);
+        ompi_coll_base_add_release_arrays_cb(c_request);
     } else {
         free(c_recvtypes);
         if (NULL != c_sendtypes) {
diff --git a/ompi/mpi/fortran/use-mpi-f08/gatherv_init_ts.c.in b/ompi/mpi/fortran/use-mpi-f08/gatherv_init_ts.c.in
@@ -112,7 +112,7 @@ PROTOTYPE VOID gatherv_init(BUFFER_ASYNC x1, COUNT sendcount, DATATYPE sendtype,
     OMPI_FORTRAN_BIGCOUNT_ARRAY_CLEANUP_NONBLOCKING(recvcounts, tmp_recvcounts, c_request, c_ierr, idx);
     OMPI_FORTRAN_BIGCOUNT_ARRAY_CLEANUP_NONBLOCKING(displs, tmp_displs, c_request, c_ierr, idx);
     if (idx > 0) {
-        ompi_coll_base_run_release_arrays_cb(c_request);
+        ompi_coll_base_add_release_arrays_cb(c_request);
     }
 }
 
diff --git a/ompi/mpi/fortran/use-mpi-f08/iallgatherv_ts.c.in b/ompi/mpi/fortran/use-mpi-f08/iallgatherv_ts.c.in
@@ -89,7 +89,7 @@ PROTOTYPE VOID iallgatherv(BUFFER_ASYNC x1, COUNT sendcount, DATATYPE sendtype,
     OMPI_FORTRAN_BIGCOUNT_ARRAY_CLEANUP_NONBLOCKING(recvcounts, tmp_recvcounts, c_request, c_ierr, idx);
     OMPI_FORTRAN_BIGCOUNT_ARRAY_CLEANUP_NONBLOCKING(displs, tmp_displs, c_request, c_ierr, idx);
     if (idx > 0) {
-        ompi_coll_base_run_release_arrays_cb(c_request);
+        ompi_coll_base_add_release_arrays_cb(c_request);
     }
 
 }
diff --git a/ompi/mpi/fortran/use-mpi-f08/ialltoallv_ts.c.in b/ompi/mpi/fortran/use-mpi-f08/ialltoallv_ts.c.in
@@ -81,7 +81,7 @@ PROTOTYPE VOID ialltoallv(BUFFER_ASYNC x1, COUNT_ARRAY sendcounts, DISP_ARRAY sd
     OMPI_FORTRAN_BIGCOUNT_ARRAY_CLEANUP_NONBLOCKING(recvcounts, tmp_recvcounts, c_request, c_ierr, idx);
     OMPI_FORTRAN_BIGCOUNT_ARRAY_CLEANUP_NONBLOCKING(rdispls, tmp_rdispls, c_request, c_ierr, idx);
     if (idx > 0) {
-        ompi_coll_base_run_release_arrays_cb(c_request);
+        ompi_coll_base_add_release_arrays_cb(c_request);
     }
 
 }
diff --git a/ompi/mpi/fortran/use-mpi-f08/ialltoallw_ts.c.in b/ompi/mpi/fortran/use-mpi-f08/ialltoallw_ts.c.in
@@ -98,6 +98,6 @@ PROTOTYPE VOID ialltoallw(BUFFER_ASYNC x1, COUNT_ARRAY sendcounts,
     OMPI_FORTRAN_BIGCOUNT_ARRAY_CLEANUP_NONBLOCKING(recvcounts, tmp_recvcounts, c_request, c_ierr, idx);
     OMPI_FORTRAN_BIGCOUNT_ARRAY_CLEANUP_NONBLOCKING(rdispls, tmp_rdispls, c_request, c_ierr, idx);
     if (idx > 0) {
-        ompi_coll_base_run_release_arrays_cb(c_request);
+        ompi_coll_base_add_release_arrays_cb(c_request);
     }
 }
diff --git a/ompi/mpi/fortran/use-mpi-f08/igatherv_ts.c.in b/ompi/mpi/fortran/use-mpi-f08/igatherv_ts.c.in
@@ -102,7 +102,7 @@ PROTOTYPE VOID igatherv(BUFFER_ASYNC x1, COUNT sendcount, DATATYPE sendtype,
     OMPI_FORTRAN_BIGCOUNT_ARRAY_CLEANUP_NONBLOCKING(recvcounts, tmp_recvcounts, c_request, c_ierr, idx);
     OMPI_FORTRAN_BIGCOUNT_ARRAY_CLEANUP_NONBLOCKING(displs, tmp_displs, c_request, c_ierr, idx);
     if (idx > 0) {
-        ompi_coll_base_run_release_arrays_cb(c_request);
+        ompi_coll_base_add_release_arrays_cb(c_request);
     }
 
 }
diff --git a/ompi/mpi/fortran/use-mpi-f08/ineighbor_allgatherv_ts.c.in b/ompi/mpi/fortran/use-mpi-f08/ineighbor_allgatherv_ts.c.in
@@ -76,6 +76,6 @@ PROTOTYPE VOID ineighbor_allgatherv(BUFFER_ASYNC x1, COUNT sendcount, DATATYPE s
     OMPI_FORTRAN_BIGCOUNT_ARRAY_CLEANUP_NONBLOCKING(recvcounts, tmp_recvcounts, c_request, c_ierr, idx);
     OMPI_FORTRAN_BIGCOUNT_ARRAY_CLEANUP_NONBLOCKING(displs, tmp_displs, c_request, c_ierr, idx);
     if (idx > 0) {
-        ompi_coll_base_run_release_arrays_cb(c_request);
+        ompi_coll_base_add_release_arrays_cb(c_request);
     }
 }
diff --git a/ompi/mpi/fortran/use-mpi-f08/ineighbor_alltoallv_ts.c.in b/ompi/mpi/fortran/use-mpi-f08/ineighbor_alltoallv_ts.c.in
@@ -81,6 +81,6 @@ PROTOTYPE VOID ineighbor_alltoallv(BUFFER_ASYNC x1, COUNT_ARRAY sendcounts, DISP
     OMPI_FORTRAN_BIGCOUNT_ARRAY_CLEANUP_NONBLOCKING(recvcounts, tmp_recvcounts, c_request, c_ierr, idx);
     OMPI_FORTRAN_BIGCOUNT_ARRAY_CLEANUP_NONBLOCKING(rdispls, tmp_rdispls, c_request, c_ierr, idx);
     if (idx > 0) {
-        ompi_coll_base_run_release_arrays_cb(c_request);
+        ompi_coll_base_add_release_arrays_cb(c_request);
     }
 }
diff --git a/ompi/mpi/fortran/use-mpi-f08/ineighbor_alltoallw_ts.c.in b/ompi/mpi/fortran/use-mpi-f08/ineighbor_alltoallw_ts.c.in
@@ -83,7 +83,7 @@ PROTOTYPE VOID ineighbor_alltoallw(BUFFER_ASYNC x1, COUNT_ARRAY sendcounts,
         OMPI_FORTRAN_BIGCOUNT_ARRAY_CLEANUP_NONBLOCKING(recvcounts, tmp_recvcounts, c_request, c_ierr, idx);
         ompi_coll_base_append_array_to_release(c_request, c_sendtypes);
         ompi_coll_base_append_array_to_release(c_request, c_recvtypes);
-        ompi_coll_base_run_release_arrays_cb(c_request);
+        ompi_coll_base_add_release_arrays_cb(c_request);
     } else {
         free(c_sendtypes);
         free(c_recvtypes);
diff --git a/ompi/mpi/fortran/use-mpi-f08/ireduce_scatter_ts.c.in b/ompi/mpi/fortran/use-mpi-f08/ireduce_scatter_ts.c.in
@@ -63,7 +63,7 @@ PROTOTYPE VOID ireduce_scatter(BUFFER_ASYNC x1, BUFFER_ASYNC_OUT x2,
 
     OMPI_FORTRAN_BIGCOUNT_ARRAY_CLEANUP_NONBLOCKING(recvcounts, tmp_recvcounts, c_request, c_ierr, idx);
     if (idx > 0) {
-        ompi_coll_base_run_release_arrays_cb(c_request);
+        ompi_coll_base_add_release_arrays_cb(c_request);
     }
 
 }
diff --git a/ompi/mpi/fortran/use-mpi-f08/iscatterv_ts.c.in b/ompi/mpi/fortran/use-mpi-f08/iscatterv_ts.c.in
@@ -107,6 +107,6 @@ PROTOTYPE VOID iscatterv(BUFFER_ASYNC x1, COUNT_ARRAY sendcounts,
     OMPI_FORTRAN_BIGCOUNT_ARRAY_CLEANUP_NONBLOCKING(sendcounts, tmp_sendcounts, c_request, c_ierr, idx);
     OMPI_FORTRAN_BIGCOUNT_ARRAY_CLEANUP_NONBLOCKING(displs, tmp_displs, c_request, c_ierr, idx);
     if (idx > 0) {
-        ompi_coll_base_run_release_arrays_cb(c_request);
+        ompi_coll_base_add_release_arrays_cb(c_request);
     }
 }
diff --git a/ompi/mpi/fortran/use-mpi-f08/neighbor_allgatherv_init_ts.c.in b/ompi/mpi/fortran/use-mpi-f08/neighbor_allgatherv_init_ts.c.in
@@ -85,6 +85,6 @@ PROTOTYPE VOID neighbor_allgatherv_init(BUFFER x1, COUNT sendcount, DATATYPE sen
     OMPI_FORTRAN_BIGCOUNT_ARRAY_CLEANUP_NONBLOCKING(recvcounts, tmp_recvcounts, c_request, c_ierr, idx);
     OMPI_FORTRAN_BIGCOUNT_ARRAY_CLEANUP_NONBLOCKING(displs, tmp_displs, c_request, c_ierr, idx);
     if (idx > 0) {
-        ompi_coll_base_run_release_arrays_cb(c_request);
+        ompi_coll_base_add_release_arrays_cb(c_request);
     }
 }
diff --git a/ompi/mpi/fortran/use-mpi-f08/neighbor_alltoallv_init_ts.c.in b/ompi/mpi/fortran/use-mpi-f08/neighbor_alltoallv_init_ts.c.in
@@ -90,6 +90,6 @@ PROTOTYPE VOID neighbor_alltoallv_init(BUFFER x1, COUNT_ARRAY sendcounts, DISP_A
     OMPI_FORTRAN_BIGCOUNT_ARRAY_CLEANUP_NONBLOCKING(rdispls, tmp_rdispls, c_request, c_ierr, idx);
     OMPI_FORTRAN_BIGCOUNT_ARRAY_CLEANUP_NONBLOCKING(sdispls, tmp_sdispls, c_request, c_ierr, idx);
     if (idx > 0) {
-        ompi_coll_base_run_release_arrays_cb(c_request);
+        ompi_coll_base_add_release_arrays_cb(c_request);
     }
 }
diff --git a/ompi/mpi/fortran/use-mpi-f08/neighbor_alltoallw_init_ts.c.in b/ompi/mpi/fortran/use-mpi-f08/neighbor_alltoallw_init_ts.c.in
@@ -92,7 +92,7 @@ PROTOTYPE VOID neighbor_alltoallw_init(BUFFER x1, COUNT_ARRAY sendcounts,
         *request = PMPI_Request_c2f(c_request);
         ompi_coll_base_append_array_to_release(c_request, c_sendtypes);
         ompi_coll_base_append_array_to_release(c_request, c_recvtypes);
-        ompi_coll_base_run_release_arrays_cb(c_request);
+        ompi_coll_base_add_release_arrays_cb(c_request);
     } else {
         free(c_recvtypes);
         free(c_sendtypes);
diff --git a/ompi/mpi/fortran/use-mpi-f08/reduce_scatter_init_ts.c.in b/ompi/mpi/fortran/use-mpi-f08/reduce_scatter_init_ts.c.in
@@ -75,7 +75,7 @@ PROTOTYPE VOID reduce_scatter_init(BUFFER x1, BUFFER_OUT x2,
 
     OMPI_FORTRAN_BIGCOUNT_ARRAY_CLEANUP_NONBLOCKING(recvcounts, tmp_recvcounts, c_request, c_ierr, idx);
     if (idx > 0) {
-        ompi_coll_base_run_release_arrays_cb(c_request);
+        ompi_coll_base_add_release_arrays_cb(c_request);
     }
 
     if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr);
diff --git a/ompi/mpi/fortran/use-mpi-f08/scatterv_init_ts.c.in b/ompi/mpi/fortran/use-mpi-f08/scatterv_init_ts.c.in
@@ -111,7 +111,7 @@ PROTOTYPE VOID scatterv_init(BUFFER x1, COUNT_ARRAY sendcounts,
     OMPI_FORTRAN_BIGCOUNT_ARRAY_CLEANUP_NONBLOCKING(sendcounts, tmp_sendcounts, c_request, c_ierr, idx);
     OMPI_FORTRAN_BIGCOUNT_ARRAY_CLEANUP_NONBLOCKING(displs, tmp_displs, c_request, c_ierr, idx);
     if (idx > 0) {
-        ompi_coll_base_run_release_arrays_cb(c_request);
+        ompi_coll_base_add_release_arrays_cb(c_request);
     }
 
      if ((c_recvdatatype != NULL ) && (c_recvdatatype != c_recvtype)){

Original file line number	Diff line number	Diff line change
`@@ -349,7 +349,7 @@ int ompi_coll_base_retain_datatypes_w( ompi_request_t *req,`
`349`	`349`	`return OMPI_SUCCESS;`
`350`	`350`	`}`
`351`	`351`
`352`		`-int ompi_coll_base_run_release_arrays_cb(ompi_request_t *req)`
	`352`	`+int ompi_coll_base_add_release_arrays_cb(ompi_request_t *req)`
`353`	`353`	`{`
`354`	`354`	`ompi_coll_base_nbc_request_t request = (ompi_coll_base_nbc_request_t )req;`
`355`	`355`
Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ void ompi_allgatherv_init_f(char sendbuf, MPI_Fint sendcount, MPI_Fint *sendty`
`110`	`110`	`if ((void )recvcounts != (void )OMPI_ARRAY_NAME_CONVERT(recvcounts)) {`
`111`	`111`	`ompi_coll_base_append_array_to_release(c_request, OMPI_ARRAY_NAME_CONVERT(recvcounts));`
`112`	`112`	`ompi_coll_base_append_array_to_release(c_request, OMPI_ARRAY_NAME_CONVERT(displs));`
`113`		`- ompi_coll_base_run_release_arrays_cb(c_request);`
	`113`	`+ ompi_coll_base_add_release_arrays_cb(c_request);`
`114`	`114`	`}`
`115`	`115`	`} else {`
`116`	`116`	`OMPI_ARRAY_FINT_2_INT_CLEANUP(recvcounts);`
Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ void ompi_alltoallv_init_f(char sendbuf, MPI_Fint sendcounts, MPI_Fint *sdispl`
`116`	`116`	`ompi_coll_base_append_array_to_release(c_request, OMPI_ARRAY_NAME_CONVERT(sdispls));`
`117`	`117`	`ompi_coll_base_append_array_to_release(c_request, OMPI_ARRAY_NAME_CONVERT(recvcounts));`
`118`	`118`	`ompi_coll_base_append_array_to_release(c_request, OMPI_ARRAY_NAME_CONVERT(rdispls));`
`119`		`- ompi_coll_base_run_release_arrays_cb(c_request);`
	`119`	`+ ompi_coll_base_add_release_arrays_cb(c_request);`
`120`	`120`	`}`
`121`	`121`	`} else {`
`122`	`122`	`OMPI_ARRAY_FINT_2_INT_CLEANUP(sendcounts);`
Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ void ompi_alltoallw_init_f(char sendbuf, MPI_Fint sendcounts,`
`133`	`133`	`ompi_coll_base_append_array_to_release(c_request, OMPI_ARRAY_NAME_CONVERT(sdispls));`
`134`	`134`	`}`
`135`	`135`	`}`
`136`		`- ompi_coll_base_run_release_arrays_cb(c_request);`
	`136`	`+ ompi_coll_base_add_release_arrays_cb(c_request);`
`137`	`137`	`} else {`
`138`	`138`	`OMPI_ARRAY_FINT_2_INT_CLEANUP(sendcounts);`
`139`	`139`	`OMPI_ARRAY_FINT_2_INT_CLEANUP(sdispls);`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ void ompi_gatherv_init_f(char sendbuf, MPI_Fint sendcount, MPI_Fint *sendtype,`
`109`	`109`	`if ((void )recvcounts != (void )OMPI_ARRAY_NAME_CONVERT(recvcounts)) {`
`110`	`110`	`ompi_coll_base_append_array_to_release(c_request, OMPI_ARRAY_NAME_CONVERT(recvcounts));`
`111`	`111`	`ompi_coll_base_append_array_to_release(c_request, OMPI_ARRAY_NAME_CONVERT(displs));`
`112`		`- ompi_coll_base_run_release_arrays_cb(c_request);`
	`112`	`+ ompi_coll_base_add_release_arrays_cb(c_request);`
`113`	`113`	`}`
`114`	`114`	`} else {`
`115`	`115`	`OMPI_ARRAY_FINT_2_INT_CLEANUP(recvcounts);`
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ void ompi_iallgatherv_f(char sendbuf, MPI_Fint sendcount, MPI_Fint *sendtype,`
`112`	`112`	`if ((void )recvcounts != (void )OMPI_ARRAY_NAME_CONVERT(recvcounts)) {`
`113`	`113`	`ompi_coll_base_append_array_to_release(c_request, OMPI_ARRAY_NAME_CONVERT(recvcounts));`
`114`	`114`	`ompi_coll_base_append_array_to_release(c_request, OMPI_ARRAY_NAME_CONVERT(displs));`
`115`		`- ompi_coll_base_run_release_arrays_cb(c_request);`
	`115`	`+ ompi_coll_base_add_release_arrays_cb(c_request);`
`116`	`116`	`}`
`117`	`117`	`}`
`118`	`118`	`}`
Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ void ompi_ialltoallv_f(char sendbuf, MPI_Fint sendcounts, MPI_Fint *sdispls,`
`120`	`120`	`ompi_coll_base_append_array_to_release(c_request, OMPI_ARRAY_NAME_CONVERT(sdispls));`
`121`	`121`	`ompi_coll_base_append_array_to_release(c_request, OMPI_ARRAY_NAME_CONVERT(recvcounts));`
`122`	`122`	`ompi_coll_base_append_array_to_release(c_request, OMPI_ARRAY_NAME_CONVERT(rdispls));`
`123`		`- ompi_coll_base_run_release_arrays_cb(c_request);`
	`123`	`+ ompi_coll_base_add_release_arrays_cb(c_request);`
`124`	`124`	`}`
`125`	`125`	`}`
`126`	`126`	`}`
Original file line number	Diff line number	Diff line change
`@@ -140,6 +140,6 @@ void ompi_ialltoallw_f(char sendbuf, MPI_Fint sendcounts,`
`140`	`140`	`}`
`141`	`141`	`ompi_coll_base_append_array_to_release(c_request, c_recvtypes);`
`142`	`142`	`ompi_coll_base_append_array_to_release(c_request, c_sendtypes);`
`143`		`- ompi_coll_base_run_release_arrays_cb(c_request);`
	`143`	`+ ompi_coll_base_add_release_arrays_cb(c_request);`
`144`	`144`	`}`
`145`	`145`	`}`
Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ void ompi_igatherv_f(char sendbuf, MPI_Fint sendcount, MPI_Fint *sendtype,`
`111`	`111`	`if ((void )recvcounts != (void )OMPI_ARRAY_NAME_CONVERT(recvcounts)) {`
`112`	`112`	`ompi_coll_base_append_array_to_release(c_request, OMPI_ARRAY_NAME_CONVERT(recvcounts));`
`113`	`113`	`ompi_coll_base_append_array_to_release(c_request, OMPI_ARRAY_NAME_CONVERT(displs));`
`114`		`- ompi_coll_base_run_release_arrays_cb(c_request);`
	`114`	`+ ompi_coll_base_add_release_arrays_cb(c_request);`
`115`	`115`	`}`
`116`	`116`	`}`
`117`	`117`	`}`