Changing the time for the timer call
authorHarshitha <gplkrsh2@illinois.edu>
Tue, 16 Oct 2012 14:54:54 +0000 (09:54 -0500)
committerHarshitha <gplkrsh2@illinois.edu>
Tue, 16 Oct 2012 14:54:54 +0000 (09:54 -0500)
src/ck-core/cklocation.C
src/ck-ldb/MetaBalancer.C

index 05a1ef2db5084047e48bde1b57e0876124c36035..95038019eef6f3396c0c514663185d85b5eafdf7 100644 (file)
@@ -1165,7 +1165,6 @@ void CkMigratable::clearMetaLBData() {
     atsync_iteration = -1;
     prev_load = 0.0;
     can_reset = false;
-    myRec->getMetaBalancer()->ResumeClients();
 //  }
 }
 
@@ -1299,7 +1298,10 @@ void CkMigratable::staticResumeFromSync(void* data)
 #if (defined(_FAULT_MLOG_) || defined(_FAULT_CAUSAL_))
     CpvAccess(_currentObj) = el;
 #endif
-  el->clearMetaLBData();
+
+  if (_lb_args.metaLbOn()) {
+       el->clearMetaLBData();
+       }
        el->ResumeFromSync();
 #if (defined(_FAULT_MLOG_) || defined(_FAULT_CAUSAL_))
     el->mlogData->resumeCount++;
index 1c8c2b7299e7527ade0e3b9c3076ef80fb2737b9..0e96b8af5e64fc01a451e1f5bd61296b67df3b72 100644 (file)
@@ -696,7 +696,7 @@ void MetaBalancer::ResetAdaptive() {
 // This is required for PEs with no objs
 void MetaBalancer::periodicCall(void *ad) {
   MetaBalancer *s = (MetaBalancer *)ad;
-  CcdCallFnAfterOnPE((CcdVoidFn)checkForNoObj, (void *)s, 1000, CkMyPe());
+  CcdCallFnAfterOnPE((CcdVoidFn)checkForNoObj, (void *)s, 500, CkMyPe());
 }
 
 void MetaBalancer::checkForNoObj(void *ad) {