Merge branch 'charm-mpi-interop' of charmgit:charm into charm
[charm.git] / src / conv-core / convcore.c
index 976c5433eebda87788ce3bcb7e2804f642d1d73a..27886a21056aafc98fc4c040aaad09ec9600baec 100644 (file)
@@ -925,7 +925,7 @@ void CmiTimerInit(char **argv)
 
   _absoluteTime = CmiGetArgFlagDesc(argv,"+useAbsoluteTime", "Use system's absolute time as wallclock time.");
 
-#if ! CMK_MEM_CHECKPOINT
+#if !CMK_MEM_CHECKPOINT && !_FAULT_MLOG_ && !_FAULT_CAUSAL_
   /* try to synchronize calling barrier */
   CmiBarrier();
   CmiBarrier();
@@ -943,7 +943,7 @@ void CmiTimerInit(char **argv)
     (ru.ru_stime.tv_sec * 1.0)+(ru.ru_stime.tv_usec * 0.000001);
 #endif
 
-#if ! CMK_MEM_CHECKPOINT
+#if ! CMK_MEM_CHECKPOINT && !_FAULT_MLOG_ && !_FAULT_CAUSAL_
   CmiBarrier();
 /*  CmiBarrierZero(); */
 #endif