[mpich2-commits] r5606 - in mpich2/trunk/src: include mpi/errhan util/dbg

[goodell at mcs.anl.gov]

Author: goodell
Date: 2009-10-28 18:24:45 -0500 (Wed, 28 Oct 2009)
New Revision: 5606

Modified:
   mpich2/trunk/src/include/mpidbg.h
   mpich2/trunk/src/mpi/errhan/errutil.c
   mpich2/trunk/src/util/dbg/dbg_printf.c
Log:
Add an ERRHAND message class for debug logging.

Also, add missing ROMIO class name entry.

Reviewed by buntinas at .

Modified: mpich2/trunk/src/include/mpidbg.h
===================================================================
--- mpich2/trunk/src/include/mpidbg.h	2009-10-28 23:24:44 UTC (rev 5605)
+++ mpich2/trunk/src/include/mpidbg.h	2009-10-28 23:24:45 UTC (rev 5606)
@@ -111,6 +111,7 @@
 		      MPIU_DBG_VC            = 0x100000,
 		      MPIU_DBG_REFCOUNT      = 0x200000,
 		      MPIU_DBG_ROMIO         = 0x400000,
+                      MPIU_DBG_ERRHAND       = 0x800000,
 		      MPIU_DBG_ALL           = (~0) };   /* alias for all */
 
 extern int MPIU_DBG_ActiveClasses;

Modified: mpich2/trunk/src/mpi/errhan/errutil.c
===================================================================
--- mpich2/trunk/src/mpi/errhan/errutil.c	2009-10-28 23:24:44 UTC (rev 5605)
+++ mpich2/trunk/src/mpi/errhan/errutil.c	2009-10-28 23:24:45 UTC (rev 5606)
@@ -250,7 +250,9 @@
     
     /* First, check the nesting level */
     if (MPIR_Nest_value()) return errcode;
-    
+
+    MPIU_DBG_MSG_FMT(ERRHAND, TERSE, (MPIU_DBG_FDEST, "MPIR_Err_return_comm(comm_ptr=%p, fcname=%s, errcode=%d)", comm_ptr, fcname, errcode));
+
     if (!comm_ptr || comm_ptr->errhandler == NULL) {
 	/* Try to replace with the default handler, which is the one on 
 	   MPI_COMM_WORLD.  This gives us correct behavior for the
@@ -333,6 +335,8 @@
     /* First, check the nesting level */
     if (MPIR_Nest_value()) return errcode;
 
+    MPIU_DBG_MSG_FMT(ERRHAND, TERSE, (MPIU_DBG_FDEST, "MPIR_Err_return_win(win_ptr=%p, fcname=%s, errcode=%d)", win_ptr, fcname, errcode));
+
     if (MPIR_Err_is_fatal(errcode) ||
 	win_ptr == NULL || win_ptr->errhandler == NULL || 
 	win_ptr->errhandler->handle == MPI_ERRORS_ARE_FATAL) {

Modified: mpich2/trunk/src/util/dbg/dbg_printf.c
===================================================================
--- mpich2/trunk/src/util/dbg/dbg_printf.c	2009-10-28 23:24:44 UTC (rev 5605)
+++ mpich2/trunk/src/util/dbg/dbg_printf.c	2009-10-28 23:24:45 UTC (rev 5606)
@@ -536,6 +536,8 @@
     { MPIU_DBG_NEM_SOCK_DET,  "NEM_SOCK_DET",  "nem_sock_det"},
     { MPIU_DBG_VC,            "VC",            "vc"},
     { MPIU_DBG_REFCOUNT,      "REFCOUNT",      "refcount"},
+    { MPIU_DBG_ROMIO,         "ROMIO",         "romio"},
+    { MPIU_DBG_ERRHAND,       "ERRHAND",       "errhand"},
     { MPIU_DBG_ALL,           "ALL",           "all" }, 
     { 0,                      0,               0 }
 };