[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.1.1-58-g6b62d39

[Service Account]

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  6b62d390c90af7acdd740bc076c847ce9e8b44c2 (commit)
      from  e807b314caa3b7960b7eca58270d9b53d7d732f7 (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/6b62d390c90af7acdd740bc076c847ce9e8b44c2

commit 6b62d390c90af7acdd740bc076c847ce9e8b44c2
Author: Su Huang <suhuang at us.ibm.com>
Date:   Fri Jun 13 12:21:20 2014 -0400

    pamid: fix MPI_Abort hang with dynamic tasking
    
    Signed-off-by: Michael Blocksome <blocksom at us.ibm.com>

diff --git a/src/mpid/pamid/src/misc/mpid_abort.c b/src/mpid/pamid/src/misc/mpid_abort.c
index dc618af..55bbbb8 100644
--- a/src/mpid/pamid/src/misc/mpid_abort.c
+++ b/src/mpid/pamid/src/misc/mpid_abort.c
@@ -85,8 +85,11 @@ int MPID_Abort(MPID_Comm * comm, int mpi_errno, int exit_code, const char *error
   MPIDI_Abort_core(comm, mpi_errno, exit_code, error_msg);
 
 #ifdef DYNAMIC_TASKING
-  return PMI2_Abort(1,error_msg);
-#else
+  extern int mpidi_dynamic_tasking;
+  if (mpidi_dynamic_tasking)
+      return PMI2_Abort(1,error_msg);
+#endif
+
   /* The POE and BGQ control systems both catch the exit value for additional
    * processing. If a process exits with '1' then all processes in the job
    * are terminated. The requested error code is lost in this process however
@@ -97,5 +100,4 @@ int MPID_Abort(MPID_Comm * comm, int mpi_errno, int exit_code, const char *error
    * dump by setting the environment variable 'BG_COREDUMPONERROR=1'.
    */
   exit(1);
-#endif
 }

-----------------------------------------------------------------------

Summary of changes:
 src/mpid/pamid/src/misc/mpid_abort.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
MPICH primary repository