setting charm ep in another beginExecute event, which was missed in previous change...
authorGengbin Zheng <gzheng@illinois.edu>
Thu, 9 Oct 2008 19:24:57 +0000 (19:24 +0000)
committerGengbin Zheng <gzheng@illinois.edu>
Thu, 9 Oct 2008 19:24:57 +0000 (19:24 +0000)
src/ck-perf/trace-bluegene.C
src/ck-perf/trace-bluegene.h

index 0d3982433112060779f56bc9a55c03fae350f86e..8bf16d0d05d9f6caf8d18d12e446cbc711937cfd 100644 (file)
@@ -141,16 +141,23 @@ void TraceBluegene::bgEndExec(int commit)
     BgEndLastLog(tTIMELINEREC);
 }
 
+void TraceBluegene::beginExecute(envelope *e)
+{
+  if (e==NULL || !genTimeLog) return;
+  BgTimeLog* log = tTIMELINE[tTIMELINE.length()-1];
+  CmiAssert(log!=NULL);
+  log->setCharmEP(e->getEpIdx());
+}
+
 void TraceBluegene::beginExecute(int event,int msgType,int ep,int srcPe, int mlen,CmiObjId *idx)
 {
   //printf("SET OBJ ID\n");
-  if (idx == NULL) return;
   BgTimeLog* log;
   if(genTimeLog)
     log = tTIMELINE[tTIMELINE.length()-1];
   else
     return;
-  log->setObjId(idx);
+  if (idx!=NULL) log->setObjId(idx);
   log->setCharmEP(ep);
 }
 
index 1237a0e82687c945d9df485b661e0071c1dd7831..c4f0f1d4f2f7f9c4fce08a81ad7829a5365551be 100644 (file)
@@ -35,7 +35,7 @@ class TraceBluegene : public Trace {
     void bgAmpiBeginExec(char *msg, char *str, void **logs, int count);
     void bgSetInfo(char *msg, char *str, void **logs, int count);
     void bgEndExec(int);
-    virtual void beginExecute(envelope *) {}
+    virtual void beginExecute(envelope *);
     virtual void beginExecute(CmiObjId *tid) {}
     virtual void beginExecute(int event,int msgType,int ep,int srcPe, int mlen,CmiObjId *idx);
     void addBackwardDep(void *log);