Merge pull request #11447 from bosilca/fix/ishrink

ulfm: fix ishrink

Author: abouteiller

ompi/mca/coll/ftagree/coll_ftagree_earlyreturning.c

@@ -813,7 +813,7 @@ static void era_update_new_dead_list(ompi_coll_ftagree_era_agreement_info_t *ci)
                          ci->agreement_id.ERAID_FIELDS.contextid,
                          ci->agreement_id.ERAID_FIELDS.epoch,
                          ci->agreement_id.ERAID_FIELDS.agreementid,
-                         r, ci->current_value->new_dead_array, ags->afr_size));
+                         r, t, ags->afr_size));
 
 #if OPAL_ENABLE_DEBUG
     {

ompi/mpiext/ftmpi/c/mpiext_ftmpi_c.h

@@ -36,6 +36,7 @@ OMPI_DECLSPEC int MPIX_Comm_iagree(MPI_Comm comm, int *flag, MPI_Request *reques
 OMPI_DECLSPEC int PMPIX_Comm_revoke(MPI_Comm comm);
 OMPI_DECLSPEC int PMPIX_Comm_is_revoked(MPI_Comm comm, int *flag);
 OMPI_DECLSPEC int PMPIX_Comm_shrink(MPI_Comm comm, MPI_Comm *newcomm);
+OMPI_DECLSPEC int PMPIX_Comm_ishrink(MPI_Comm comm, MPI_Comm *newcomm, MPI_Request *request);
 OMPI_DECLSPEC int PMPIX_Comm_failure_ack(MPI_Comm comm);
 OMPI_DECLSPEC int PMPIX_Comm_failure_get_acked(MPI_Comm comm, MPI_Group *failedgrp);
 OMPI_DECLSPEC int PMPIX_Comm_get_failed(MPI_Comm comm, MPI_Group *failedgroup);

ompi/mpiext/ftmpi/c/profile/Makefile.am

@@ -21,6 +21,7 @@ nodist_libpmpiext_ftmpi_c_la_SOURCES = \
     pcomm_revoke.c \
     pcomm_is_revoked.c \
     pcomm_shrink.c \
+    pcomm_ishrink.c \
     pcomm_get_failed.c \
     pcomm_ack_failed.c \
     pcomm_failure_ack.c \

ompi/mpiext/ftmpi/mpif-h/comm_ishrink_f.c

@@ -59,9 +59,9 @@ void ompix_comm_ishrink_f(MPI_Fint *comm, MPI_Fint *newcomm, MPI_Fint *request,
     MPI_Request c_req;
     MPI_Comm c_newcomm;
 
-    *ierr = OMPI_INT_2_FINT(MPIX_Comm_ishrink(c_comm,
-                                             &c_newcomm,
-                                             &c_req));
+    *ierr = OMPI_INT_2_FINT(PMPIX_Comm_ishrink(c_comm,
+                                               &c_newcomm,
+                                               &c_req));
 
     if (MPI_SUCCESS == OMPI_FINT_2_INT(*ierr)) {
         *request = PMPI_Request_c2f(c_req);

ompi/mpiext/ftmpi/mpif-h/prototypes_mpi.h

@@ -43,6 +43,7 @@ PN2(void, MPIX_Comm_agree, mpix_comm_agree, MPIX_COMM_AGREE, (MPI_Fint *comm, om
 PN2(void, MPIX_Comm_failure_ack, mpix_comm_failure_ack, MPIX_COMM_FAILURE_ACK, (MPI_Fint *comm, MPI_Fint *ierr));
 PN2(void, MPIX_Comm_failure_get_acked, mpix_comm_failure_get_acked, MPIX_COMM_FAILURE_GET_ACKED, (MPI_Fint *comm, MPI_Fint *group, MPI_Fint *ierr));
 PN2(void, MPIX_Comm_iagree, mpix_comm_iagree, MPIX_COMM_IAGREE, (MPI_Fint *comm, ompi_fortran_logical_t *flag, MPI_Fint *request, MPI_Fint *ierr));
+PN2(void, MPIX_Comm_ishrink, mpix_comm_ishrink, MPIX_COMM_ISHRINK, (MPI_Fint *comm, MPI_Fint *newcomm, MPI_Fint *request, MPI_Fint *ierr));
 PN2(void, MPIX_Comm_is_revoked, mpix_comm_is_revoked, MPIX_COMM_IS_REVOKED, (MPI_Fint *comm, ompi_fortran_logical_t *flag, MPI_Fint *ierr));
 PN2(void, MPIX_Comm_revoke, mpix_comm_revoke, MPIX_COMM_REVOKE, (MPI_Fint *comm, MPI_Fint *ierr));
 PN2(void, MPIX_Comm_shrink, mpix_comm_shrink, MPIX_COMM_SHRINK, (MPI_Fint *comm, MPI_Fint *newcomm, MPI_Fint *ierr));