Added CMK_TRACE_ENABLED to guard the tracing of comm thread
authorChao Mei <chaomei2@illinois.edu>
Fri, 1 Apr 2011 23:36:02 +0000 (18:36 -0500)
committerChao Mei <chaomei2@illinois.edu>
Fri, 1 Apr 2011 23:36:02 +0000 (18:36 -0500)
src/arch/mpi/machine.c

index 6c926c11f83990deeae4287449e4928cda8d6f5a..43a0082cce21c97fc2a57dd39feb2e9da1dd004e 100644 (file)
@@ -70,16 +70,22 @@ static int dynamicRecvCap = -1;
 #endif
 
 
 #endif
 
 
-#if CMK_SMP_TRACE_COMMTHREAD
+#if CMK_TRACE_ENABLED && CMK_SMP_TRACE_COMMTHREAD
 #define CMI_MPI_TRACE_MOREDETAILED 0
 #undef CMI_MPI_TRACE_USEREVENTS
 #define CMI_MPI_TRACE_USEREVENTS 1
 #define CMI_MPI_TRACE_MOREDETAILED 0
 #undef CMI_MPI_TRACE_USEREVENTS
 #define CMI_MPI_TRACE_USEREVENTS 1
+#else
+#undef CMK_SMP_TRACE_COMMTHREAD
+#define CMK_SMP_TRACE_COMMTHREAD 0
 #endif
 
 #define CMK_TRACE_COMMOVERHEAD 0
 #endif
 
 #define CMK_TRACE_COMMOVERHEAD 0
-#if CMK_TRACE_COMMOVERHEAD
+#if CMK_TRACE_ENABLED && CMK_TRACE_COMMOVERHEAD
 #undef CMI_MPI_TRACE_USEREVENTS
 #define CMI_MPI_TRACE_USEREVENTS 1
 #undef CMI_MPI_TRACE_USEREVENTS
 #define CMI_MPI_TRACE_USEREVENTS 1
+#else
+#undef CMK_TRACE_COMMOVERHEAD
+#define CMK_TRACE_COMMOVERHEAD 0
 #endif
 
 #include "machine.h"
 #endif
 
 #include "machine.h"