fixed a bug in CkExit() with projections which has end_execute without matching begin...
authorGengbin Zheng <gzheng@illinois.edu>
Thu, 9 Jun 2011 21:26:44 +0000 (16:26 -0500)
committerGengbin Zheng <gzheng@illinois.edu>
Thu, 9 Jun 2011 21:26:44 +0000 (16:26 -0500)
src/ck-cp/controlPoints.C
src/ck-perf/trace-summary.C

index d6bdacab5b9bf63873c21a116876297e88f258a8..af78dcd3aaff3d82a7680a6b3b497a2c73bf8756 100644 (file)
@@ -412,8 +412,9 @@ void controlPointManager::setFrameworkAdvancePhase(bool _frameworkShouldAdvanceP
   /// Currently called on each PE
   void controlPointManager::processControlPoints(){
 
+#if DEBUGPRINT
     CkPrintf("[%d] processControlPoints() haveControlPointChangeCallback=%d frameworkShouldAdvancePhase=%d\n", CkMyPe(), (int)haveControlPointChangeCallback, (int)frameworkShouldAdvancePhase);
-
+#endif
 
     //==========================================================================================
     // Print the data for each phase
@@ -923,6 +924,7 @@ void controlPointManager::setFrameworkAdvancePhase(bool _frameworkShouldAdvanceP
 
 
   void controlPointManager::doExitNow(){
+          _TRACE_BEGIN_EXECUTE_DETAILED(-1, -1, _threadEP,CkMyPe(), 0, NULL);
          writeOutputToDisk();
          //      CkPrintf("[%d] Control point manager calling CkExit()\n", CkMyPe());
          CkExit();
index 0537b343258f2436190cb4e1f8a274e5a0036dc0..d0f712fe4603d3f04938b0e557ae9ee519b0ba2a 100644 (file)
@@ -1235,7 +1235,10 @@ extern "C" void CombineSummary()
     CProxy_TraceSummaryBOC sumProxy(traceSummaryGID);
     sumProxy[0].startSumOnly();
   }
-  else CkExit();
+  else {
+    _TRACE_BEGIN_EXECUTE_DETAILED(-1, -1, _threadEP,CkMyPe(), 0, NULL);
+    CkExit();
+  }
 #else
   CkExit();
 #endif