[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.1-13-g3a0c834

[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  3a0c834a27913fe32bf0f78a813be1e1797e5967 (commit)
       via  0f5ad0383182eddcf097758c9b863c3287bd539f (commit)
       via  627daf2e8f7c9ef9ddeef725f7e7543ef47b62b9 (commit)
      from  9096ccd7490765a023dab13da6cfabee098b6b41 (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/3a0c834a27913fe32bf0f78a813be1e1797e5967

commit 3a0c834a27913fe32bf0f78a813be1e1797e5967
Author: Jeff Hammond <jeff.science at gmail.com>
Date:   Mon Feb 24 14:25:32 2014 -0600

    add Jed's cleanup w.r.t. silent abort
    
    see http://lists.mpich.org/pipermail/discuss/2014-February/002224.html
    for the details
    
    Fixes #2038
    
    Signed-off-by: Junchao Zhang <jczhang at mcs.anl.gov>

diff --git a/src/mpi/init/abort.c b/src/mpi/init/abort.c
index f0b4cdc..bb1a63b 100644
--- a/src/mpi/init/abort.c
+++ b/src/mpi/init/abort.c
@@ -74,7 +74,7 @@ int MPI_Abort(MPI_Comm comm, int errorcode)
     int mpi_errno = MPI_SUCCESS;
     MPID_Comm *comm_ptr = NULL;
     /* FIXME: 100 is arbitrary and may not be long enough */
-    char abort_str[100], comm_name[MPI_MAX_OBJECT_NAME];
+    char abort_str[100] = "", comm_name[MPI_MAX_OBJECT_NAME];
     int len = MPI_MAX_OBJECT_NAME;
     MPID_MPI_STATE_DECL(MPID_STATE_MPI_ABORT);
 
diff --git a/src/mpid/ch3/src/mpid_abort.c b/src/mpid/ch3/src/mpid_abort.c
index f0877ca..74b8a56 100644
--- a/src/mpid/ch3/src/mpid_abort.c
+++ b/src/mpid/ch3/src/mpid_abort.c
@@ -94,7 +94,7 @@ int MPID_Abort(MPID_Comm * comm, int mpi_errno, int exit_code,
 #elif defined(MPIDI_DEV_IMPLEMENTS_ABORT)
     MPIDI_CH3I_PMI_Abort(exit_code, error_msg);
 #else
-    MPIU_Error_printf("%s\n", error_msg);
+    if (error_msg[0]) MPIU_Error_printf("%s\n", error_msg);
     fflush(stderr);
 #endif
 

http://git.mpich.org/mpich.git/commitdiff/0f5ad0383182eddcf097758c9b863c3287bd539f

commit 0f5ad0383182eddcf097758c9b863c3287bd539f
Author: Jeff Hammond <jeff.science at gmail.com>
Date:   Fri Feb 21 13:31:30 2014 -0600

    change default for abort msg suppression to false
    
    Signed-off-by: Junchao Zhang <jczhang at mcs.anl.gov>

diff --git a/src/mpi/init/abort.c b/src/mpi/init/abort.c
index 24de354..f0b4cdc 100644
--- a/src/mpi/init/abort.c
+++ b/src/mpi/init/abort.c
@@ -17,7 +17,7 @@ cvars:
     - name        : MPIR_CVAR_SUPPRESS_ABORT_MESSAGE
       category    : ERROR_HANDLING
       type        : boolean
-      default     : true
+      default     : false
       class       : device
       verbosity   : MPI_T_VERBOSITY_USER_BASIC
       scope       : MPI_T_SCOPE_ALL_EQ
@@ -129,8 +129,8 @@ int MPI_Abort(MPI_Comm comm, int errorcode)
     {
 	MPIU_Snprintf(comm_name, MPI_MAX_OBJECT_NAME, "comm=0x%X", comm);
     }
-    /* FIXME: This is not internationalized */
     if (!MPIR_CVAR_SUPPRESS_ABORT_MESSAGE)
+        /* FIXME: This is not internationalized */
         MPIU_Snprintf(abort_str, 100, "application called MPI_Abort(%s, %d) - process %d", comm_name, errorcode, comm_ptr->rank);
     mpi_errno = MPID_Abort( comm_ptr, mpi_errno, errorcode, abort_str );
     /* --BEGIN ERROR HANDLING-- */

http://git.mpich.org/mpich.git/commitdiff/627daf2e8f7c9ef9ddeef725f7e7543ef47b62b9

commit 627daf2e8f7c9ef9ddeef725f7e7543ef47b62b9
Author: Jeff Hammond <jeff.science at gmail.com>
Date:   Fri Feb 21 13:09:41 2014 -0600

    add CVAR to disable Abort message
    
    PETSc users are confused by error messages because they can't be
    troubled to understand them.
    
    Barry Smith requested that MPICH not indicate that it is aborting.
    
    this is part 1 of N patches to address this.
    
    Signed-off-by: Junchao Zhang <jczhang at mcs.anl.gov>

diff --git a/src/mpi/init/abort.c b/src/mpi/init/abort.c
index 13a33d8..24de354 100644
--- a/src/mpi/init/abort.c
+++ b/src/mpi/init/abort.c
@@ -10,6 +10,22 @@
 #include <stdlib.h>
 #endif
 
+/*
+=== BEGIN_MPI_T_CVAR_INFO_BLOCK ===
+
+cvars:
+    - name        : MPIR_CVAR_SUPPRESS_ABORT_MESSAGE
+      category    : ERROR_HANDLING
+      type        : boolean
+      default     : true
+      class       : device
+      verbosity   : MPI_T_VERBOSITY_USER_BASIC
+      scope       : MPI_T_SCOPE_ALL_EQ
+      description : Disable printing of abort error message.
+
+=== END_MPI_T_CVAR_INFO_BLOCK ===
+*/
+
 /* -- Begin Profiling Symbol Block for routine MPI_Abort */
 #if defined(HAVE_PRAGMA_WEAK)
 #pragma weak MPI_Abort = PMPI_Abort
@@ -114,7 +130,8 @@ int MPI_Abort(MPI_Comm comm, int errorcode)
 	MPIU_Snprintf(comm_name, MPI_MAX_OBJECT_NAME, "comm=0x%X", comm);
     }
     /* FIXME: This is not internationalized */
-    MPIU_Snprintf(abort_str, 100, "application called MPI_Abort(%s, %d) - process %d", comm_name, errorcode, comm_ptr->rank);
+    if (!MPIR_CVAR_SUPPRESS_ABORT_MESSAGE)
+        MPIU_Snprintf(abort_str, 100, "application called MPI_Abort(%s, %d) - process %d", comm_name, errorcode, comm_ptr->rank);
     mpi_errno = MPID_Abort( comm_ptr, mpi_errno, errorcode, abort_str );
     /* --BEGIN ERROR HANDLING-- */
     if (mpi_errno != MPI_SUCCESS) goto fn_fail;

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

Summary of changes:
 src/mpi/init/abort.c          |   23 ++++++++++++++++++++---
 src/mpid/ch3/src/mpid_abort.c |    2 +-
 2 files changed, 21 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
MPICH primary repository