fix CmiBarrier newly added to charmInit for bigsim
authorGengbin Zheng <gzheng@illinois.edu>
Thu, 19 Jan 2012 16:39:18 +0000 (10:39 -0600)
committerGengbin Zheng <gzheng@illinois.edu>
Thu, 19 Jan 2012 16:39:18 +0000 (10:39 -0600)
src/ck-core/init.C
src/ck-core/middle-blue.h

index 50d746e66a9f8108e4f476f247360e57b648bcde..5fa514a4840c0eabd1786cdf1096c1725a86aac9 100644 (file)
@@ -1161,9 +1161,12 @@ void _initCharm(int unused_argc, char **argv)
        CkpvAccess(_msgPool) = new MsgPool();
 
        CmiNodeAllBarrier();
+
+#if ! CMK_MEM_CHECKPOINT
        CmiBarrier();
        CmiBarrier();
        CmiBarrier();
+#endif
 #if CMK_SMP_TRACE_COMMTHREAD
        _TRACE_BEGIN_COMPUTATION();     
 #else
index e70d2105490ea0d6d5c62edddae4948cab9a142f..b702ac445216312bff78a27c74941efff00d9d24 100644 (file)
@@ -195,6 +195,9 @@ void CkReduce(void *msg, int size, CmiReduceMergeFn mergeFn);
 #undef CmiNodeAllBarrier
 #define CmiNodeAllBarrier()
 
+#undef CmiBarrier
+#define CmiBarrier()
+
 /** common functions for two versions */
 namespace BGConverse {