fix the bug incurred by previous commit
authorXiang Ni <xiangni2@illinois.edu>
Tue, 16 Oct 2012 03:17:36 +0000 (22:17 -0500)
committerXiang Ni <xiangni2@illinois.edu>
Tue, 16 Oct 2012 03:17:36 +0000 (22:17 -0500)
src/ck-core/ckcheckpoint.C
src/ck-core/ckmemcheckpoint.C

index cbc9527c680cbfe446af20509d4508a14b7aa64b..89402fd4aff9c64316b8e8074efcbf879c4f0d97 100644 (file)
@@ -17,8 +17,8 @@ More documentation goes here...
 void noopit(const char*, ...)
 {}
 
-#define DEBCHK   CkPrintf
-//#define DEBCHK noopit
+//#define DEBCHK   CkPrintf
+#define DEBCHK noopit
 
 #define DEBUGC(x) x
 //#define DEBUGC(x) 
index 5fa1b4c3eb3bd5a904891921d7a447d120bdc675..072a5f6b0eaa2240ac163f17411734c17b9c9ac1 100644 (file)
@@ -54,9 +54,6 @@ void noopck(const char*, ...)
 //#define DEBUGF       CkPrintf
 #define DEBUGF noopck
 
-//use CmiReduce in converse restart
-#define CMK_USE_BARRIER        1       
-
 // pick buddy processor from a different physical node
 #define NODE_CHECKPOINT                        0
 
@@ -1031,15 +1028,6 @@ static void restartBeginHandler(char *msg)
 {
 #if CMK_MEM_CHECKPOINT
   CmiFree(msg);
-#if    CMK_USE_BARRIER
-       if(CkMyPe()!=_diePE){
-               char *restartmsg = (char*)CmiAlloc(CmiMsgHeaderSizeBytes);
-               CmiSetHandler(restartmsg, restartBeginHandlerIdx);
-               CmiSyncSendAndFree(_diePE, CmiMsgHeaderSizeBytes, (char *)restartmsg);
-       }else{
-               CkRestartCheckPointCallback(NULL,NULL);
-       }
-#else
   static int count = 0;
   CmiAssert(CkMyPe() == _diePE);
   count ++;
@@ -1048,7 +1036,6 @@ static void restartBeginHandler(char *msg)
     count = 0;
   }
 #endif
-#endif
 }
 
 extern void _discard_charm_message();
@@ -1086,11 +1073,7 @@ static void restartBcastHandler(char *msg)
     // reduction
   char *restartmsg = (char*)CmiAlloc(CmiMsgHeaderSizeBytes);
   CmiSetHandler(restartmsg, restartBeginHandlerIdx);
-#if CMK_USE_BARRIER
-       CmiReduce(restartmsg,CmiMsgHeaderSizeBytes,doNothingMsg);
-#else
   CmiSyncSendAndFree(_diePE, CmiMsgHeaderSizeBytes, (char *)restartmsg);
-#endif
   checkpointed = 0;
 #endif
 }