This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, master has been updated via b270ae2b734be3e34e1906cfa9cb8e56a89d7b53 (commit) from 696f9fa884942a5405332c0e80f90f5e51a218e2 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.mpich.org/mpich.git/commitdiff/b270ae2b734be3e34e1906cfa9cb8e56a8... commit b270ae2b734be3e34e1906cfa9cb8e56a89d7b53 Author: Pavan Balaji <[email protected]> Date: Wed Jan 29 16:04:58 2014 -0600 Revert "Move communicator destruction to after progress checks." This reverts commit 058c8bf0faa313029f396459adde878786f1c41f. Refs #1996. diff --git a/src/mpid/ch3/src/mpid_finalize.c b/src/mpid/ch3/src/mpid_finalize.c index a959339..1a1ad98 100644 --- a/src/mpid/ch3/src/mpid_finalize.c +++ b/src/mpid/ch3/src/mpid_finalize.c @@ -93,6 +93,17 @@ int MPID_Finalize(void) * cancel it, in which case an error shouldn't be generated. */ +#ifdef MPID_NEEDS_ICOMM_WORLD + mpi_errno = MPIR_Comm_release_always(MPIR_Process.icomm_world, 0); + if (mpi_errno) MPIU_ERR_POP(mpi_errno); +#endif + + mpi_errno = MPIR_Comm_release_always(MPIR_Process.comm_self, 0); + if (mpi_errno) MPIU_ERR_POP(mpi_errno); + + mpi_errno = MPIR_Comm_release_always(MPIR_Process.comm_world, 0); + if (mpi_errno) MPIU_ERR_POP(mpi_errno); + /* Re-enabling the close step because many tests are failing * without it, particularly under gforker */ #if 1 @@ -119,17 +130,6 @@ int MPID_Finalize(void) mpi_errno = MPIDI_PG_Finalize(); if (mpi_errno) { MPIU_ERR_POP(mpi_errno); } -#ifdef MPID_NEEDS_ICOMM_WORLD - mpi_errno = MPIR_Comm_release_always(MPIR_Process.icomm_world, 0); - if (mpi_errno) MPIU_ERR_POP(mpi_errno); -#endif - - mpi_errno = MPIR_Comm_release_always(MPIR_Process.comm_self, 0); - if (mpi_errno) MPIU_ERR_POP(mpi_errno); - - mpi_errno = MPIR_Comm_release_always(MPIR_Process.comm_world, 0); - if (mpi_errno) MPIU_ERR_POP(mpi_errno); - #ifndef MPIDI_CH3_HAS_NO_DYNAMIC_PROCESS MPIDI_CH3_FreeParentPort(); #endif ----------------------------------------------------------------------- Summary of changes: src/mpid/ch3/src/mpid_finalize.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) hooks/post-receive -- MPICH primary repository