[mpich2-commits] r6606 - mpich2/trunk/src/mpe2/src/wrappers/src

[chan at mcs.anl.gov]

Author: chan
Date: 2010-05-02 00:29:41 -0500 (Sun, 02 May 2010)
New Revision: 6606

Modified:
   mpich2/trunk/src/mpe2/src/wrappers/src/log_mpi_core.c
Log:
Another bugfix for req#1033, or finish the incomplete bugfix in r6564.



Modified: mpich2/trunk/src/mpe2/src/wrappers/src/log_mpi_core.c
===================================================================
--- mpich2/trunk/src/mpe2/src/wrappers/src/log_mpi_core.c	2010-05-02 04:51:20 UTC (rev 6605)
+++ mpich2/trunk/src/mpe2/src/wrappers/src/log_mpi_core.c	2010-05-02 05:29:41 UTC (rev 6606)
@@ -469,6 +469,12 @@
     if (!commIDs) \
         commIDs = CLOG_CommSet_get_IDs( CLOG_CommSet, comm ); \
 
+#define MPE_LOG_COMMFREE(new_comm,comm_etype) \
+    if ( new_comm == MPI_COMM_NULL ) { \
+        MPE_Log_commIDs_nullcomm( commIDs, THREADID, comm_etype ); \
+        MPE_LOG_SOLO_EVENT( commIDs, THREADID, MPE_COMM_FINALIZE_ID ) \
+    }
+
 /*
    Update commIDs after CLOG_CommSet_add_intracomm() which may have invoked
    realloc() on CLOG_CommSet's table[] of commIDs, because invocation
@@ -495,10 +501,6 @@
         MPE_Log_commIDs_intracomm( commIDs, THREADID, \
                                    comm_etype, new_commIDs ); \
         MPE_LOG_SOLO_EVENT( new_commIDs, THREADID, MPE_COMM_INIT_ID ) \
-    } \
-    else { \
-        MPE_Log_commIDs_nullcomm( commIDs, THREADID, comm_etype ); \
-        MPE_LOG_SOLO_EVENT( commIDs, THREADID, MPE_COMM_FINALIZE_ID ) \
     }
 
 /*
@@ -527,10 +529,6 @@
         MPE_Log_commIDs_intercomm( commIDs, THREADID, \
                                    comm_etype, new_commIDs ); \
         MPE_LOG_SOLO_EVENT( new_commIDs, THREADID, MPE_COMM_INIT_ID ) \
-    } \
-    else { \
-        MPE_Log_commIDs_nullcomm( commIDs, THREADID, comm_etype ); \
-        MPE_LOG_SOLO_EVENT( commIDs, THREADID, MPE_COMM_FINALIZE_ID ) \
     }
 
 #define MPE_LOG_ON \
@@ -2438,7 +2436,7 @@
 {
   int   returnVal;
   MPE_LOG_STATE_DECL
-  MPE_LOG_COMM_DECL
+  MPE_LOG_SOLO_EVENT_DECL
   MPE_LOG_THREADSTM_DECL
 
 /*
@@ -2463,9 +2461,7 @@
 #endif
 
   MPE_LOG_THREAD_LOCK
-  if ( *comm == MPI_COMM_NULL ) {
-      MPE_LOG_INTRACOMM(*comm,MPI_COMM_NULL,CLOG_COMM_FREE)
-  }
+  MPE_LOG_COMMFREE(*comm,CLOG_COMM_FREE)
 
   MPE_LOG_STATE_END(*comm,NULL)
   MPE_LOG_THREAD_UNLOCK