Tracing: Move tracing thread listeners to trace-common

Previously, only tracemode projections used these listeners, meaning
other tracemodes did not get EP information for resumptions of
[threaded] EPs. Now all tracemodes will automatically get the correct
data.

Author: rbuch

src/ck-perf/trace-common.C

@@ -19,6 +19,8 @@
 #include "allEvents.h"          //projector
 #include "register.h" // for _entryTable
 
+#include "envelope.h"
+
 // To get username
 #if defined(_WIN32) || defined(_WIN64)
 #define WIN32_LEAN_AND_MEAN
@@ -853,13 +855,62 @@ void traceEnableCCS(void)
   CkpvAccess(_traces)->traceEnableCCS();  
 }
 
-/* **CW** Support for thread listeners. This makes a call to each
-   trace module which must support the call.
-*/
-void traceAddThreadListeners(CthThread tid, envelope *e) {
-  _TRACE_ONLY(CkpvAccess(_traces)->traceAddThreadListeners(tid, e));
+struct TraceThreadListener {
+  struct CthThreadListener base;
+  int event;
+  int msgType;
+  int ep;
+  int srcPe;
+  int ml;
+  CmiObjId idx;
+};
+
+static void traceThreadListener_suspend(struct CthThreadListener *l)
+{
+  TraceThreadListener *a=(TraceThreadListener *)l;
+  /* here, we activate the appropriate trace codes for the appropriate
+     registered modules */
+  traceSuspend();
+}
+
+static void traceThreadListener_resume(struct CthThreadListener *l)
+{
+  TraceThreadListener *a=(TraceThreadListener *)l;
+  /* here, we activate the appropriate trace codes for the appropriate
+     registered modules */
+  _TRACE_BEGIN_EXECUTE_DETAILED(a->event,a->msgType,a->ep,a->srcPe,a->ml,
+				CthGetThreadID(a->base.thread), NULL);
+  a->event=-1;
+  a->srcPe=CkMyPe(); /* potential lie to migrated threads */
+  a->ml=0;
+}
+
+static void traceThreadListener_free(struct CthThreadListener *l)
+{
+  TraceThreadListener *a=(TraceThreadListener *)l;
+  delete a;
 }
 
+void traceAddThreadListeners(CthThread tid, envelope *e)
+{
+#if CMK_TRACE_ENABLED
+  /* strip essential information from the envelope */
+  TraceThreadListener *a= new TraceThreadListener;
+
+  a->base.suspend=traceThreadListener_suspend;
+  a->base.resume=traceThreadListener_resume;
+  a->base.free=traceThreadListener_free;
+  a->event=e->getEvent();
+  a->msgType=e->getMsgtype();
+  a->ep=e->getEpIdx();
+  a->srcPe=e->getSrcPe();
+  a->ml=e->getTotalsize();
+
+  CthAddListener(tid, (CthThreadListener *)a);
+#endif
+}
+
+
 #if 1
 // helper functions
 extern int _charmHandlerIdx;

src/ck-perf/trace-projections.C

@@ -110,63 +110,6 @@ void _createTraceprojections(char **argv)
   CkpvAccess(_traces)->addTrace(CkpvAccess(_trace));
   if (CkMyPe()==0) CkPrintf("Charm++: Tracemode Projections enabled.\n");
 }
- 
-/* ****** CW TEMPORARY LOCATION ***** Support for thread listeners */
-
-struct TraceThreadListener {
-  struct CthThreadListener base;
-  int event;
-  int msgType;
-  int ep;
-  int srcPe;
-  int ml;
-  CmiObjId idx;
-};
-
-static void traceThreadListener_suspend(struct CthThreadListener *l)
-{
-  TraceThreadListener *a=(TraceThreadListener *)l;
-  /* here, we activate the appropriate trace codes for the appropriate
-     registered modules */
-  traceSuspend();
-}
-
-static void traceThreadListener_resume(struct CthThreadListener *l)
-{
-  TraceThreadListener *a=(TraceThreadListener *)l;
-  /* here, we activate the appropriate trace codes for the appropriate
-     registered modules */
-  _TRACE_BEGIN_EXECUTE_DETAILED(a->event,a->msgType,a->ep,a->srcPe,a->ml,
-				CthGetThreadID(a->base.thread), NULL);
-  a->event=-1;
-  a->srcPe=CkMyPe(); /* potential lie to migrated threads */
-  a->ml=0;
-}
-
-static void traceThreadListener_free(struct CthThreadListener *l)
-{
-  TraceThreadListener *a=(TraceThreadListener *)l;
-  delete a;
-}
-
-void TraceProjections::traceAddThreadListeners(CthThread tid, envelope *e)
-{
-#if CMK_TRACE_ENABLED
-  /* strip essential information from the envelope */
-  TraceThreadListener *a= new TraceThreadListener;
-  
-  a->base.suspend=traceThreadListener_suspend;
-  a->base.resume=traceThreadListener_resume;
-  a->base.free=traceThreadListener_free;
-  a->event=e->getEvent();
-  a->msgType=e->getMsgtype();
-  a->ep=e->getEpIdx();
-  a->srcPe=e->getSrcPe();
-  a->ml=e->getTotalsize();
-
-  CthAddListener(tid, (CthThreadListener *)a);
-#endif
-}
 
 void LogPool::openLog(const char *mode)
 {

src/ck-perf/trace-projections.h

@@ -526,7 +526,6 @@ class TraceProjections : public Trace {
     }
 
     /* for overiding basic thread listener support in Trace class */
-    virtual void traceAddThreadListeners(CthThread tid, envelope *e);
 };
 
 using namespace PUP;