take Projector out and protect it with a macro CMK_PROJECTOR
authorGengbin Zheng <gzheng@illinois.edu>
Mon, 25 Jul 2011 03:36:27 +0000 (22:36 -0500)
committerGengbin Zheng <gzheng@illinois.edu>
Mon, 25 Jul 2011 03:36:27 +0000 (22:36 -0500)
src/ck-perf/trace-converse.c
src/conv-core/convcore.c

index 92842cab94a2614b9f64a22f5aaa6ea284dde08e..d3995e277a31362100e23b76ed4ebdbd5299aa1e 100644 (file)
 #include "conv-trace.h"
 
 CpvDeclare(int, traceOn); /* For threads.c */
+#if CMK_TRACE_ENABLED && CMK_PROJECTOR
 CpvExtern(int, _traceCoreOn);   /* For cursed projector core */
+#endif
 int _threadEP=-123; /* for charmProjections.C */
 int traceBluegeneLinked = 0;
 
 void traceInit(char **argv) {
   CpvInitialize(int, traceOn);
   CpvAccess(traceOn)=0;
-#if CMK_TRACE_ENABLED
+#if CMK_TRACE_ENABLED && CMK_PROJECTOR
   CpvInitialize(int, _traceCoreOn); 
   CpvAccess(_traceCoreOn)=0; 
   /* initTraceCore(argv); */
index 2ca2a545d2978d8ca44ee574d129967fdcd8caf2..f9ca9d4ea32ee2a977e2d54e18755435b761983d 100644 (file)
 #include "conv-ccs.h"
 #include "ccs-server.h"
 #include "memory-isomalloc.h"
+#if CMK_PROJECTOR
 #include "converseEvents.h"             /* projector */
 #include "traceCoreCommon.h"    /* projector */
 #include "machineEvents.h"     /* projector */
+#endif
 
 extern const char * const CmiCommitID;
 
@@ -1542,7 +1544,9 @@ void (*handler)();
 void CsdBeginIdle(void)
 {
   CcdCallBacks();
+#if CMK_TRACE_ENABLED && CMK_PROJECTOR
   _LOG_E_PROC_IDLE();  /* projector */
+#endif
   CcdRaiseCondition(CcdPROCESSOR_BEGIN_IDLE) ;
 }
 
@@ -1553,7 +1557,9 @@ void CsdStillIdle(void)
 
 void CsdEndIdle(void)
 {
+#if CMK_TRACE_ENABLED && CMK_PROJECTOR
   _LOG_E_PROC_BUSY();  /* projector */
+#endif
   CcdRaiseCondition(CcdPROCESSOR_BEGIN_BUSY) ;
 }
 
@@ -1566,7 +1572,7 @@ void CmiHandleMessage(void *msg)
        CpvAccess(cQdState)->mProcessed++;
 */
        CmiHandlerInfo *h;
-#if CMK_TRACE_ENABLED
+#if CMK_TRACE_ENABLED && CMK_PROJECTOR
        CmiUInt2 handler=CmiGetHandler(msg); /* Save handler for use after msg is gone */
        _LOG_E_HANDLER_BEGIN(handler); /* projector */
        /* setMemoryStatus(1) */ /* charmdebug */