bug fix
authorHarshitha <gplkrsh2@illinois.edu>
Fri, 12 Oct 2012 17:35:13 +0000 (12:35 -0500)
committerHarshitha <gplkrsh2@illinois.edu>
Fri, 12 Oct 2012 17:35:13 +0000 (12:35 -0500)
src/ck-core/cklocation.C
src/ck-ldb/MetaBalancer.C

index 77546a726919c5a394b44193596741dc974c4ae4..d9a2b8f7260dff562ef9cbf54a2be3cc89e0bdd2 100644 (file)
@@ -2052,6 +2052,17 @@ CkLocMgr::CkLocMgr(CkGroupID mapID_,CkGroupID lbdbID_,CkGroupID metalbID_,CkArra
        hashImmLock = CmiCreateImmediateLock();
 }
 
        hashImmLock = CmiCreateImmediateLock();
 }
 
+CkLocMgr::CkLocMgr(CkGroupID mapID_,CkGroupID lbdbID_,CkArrayIndex& numInitial)
+       :thisProxy(thisgroup),thislocalproxy(thisgroup,CkMyPe()),
+        hash(17,0.3)
+{
+#if !CMK_LBDB_ON
+       CkGroupID _metalb;
+#endif
+       CkLocMgr(mapID_, lbdbID_, _metalb, numInitial);
+}
+
+
 CkLocMgr::CkLocMgr(CkMigrateMessage* m)
        :IrrGroup(m),thisProxy(thisgroup),thislocalproxy(thisgroup,CkMyPe()),hash(17,0.3)
 {
 CkLocMgr::CkLocMgr(CkMigrateMessage* m)
        :IrrGroup(m),thisProxy(thisgroup),thislocalproxy(thisgroup,CkMyPe()),hash(17,0.3)
 {
index a550a226ba9f7d1be813f3ace1f54a16ec18c427..ad540587de85d63cffa287ac81935d0c3af4b5dd 100644 (file)
@@ -604,7 +604,7 @@ void MetaBalancer::LoadBalanceDecisionFinal(int req_no, int period) {
                        period:%d \n",CkMyPe(), adaptive_struct.lb_iteration_no, period));
   adaptive_struct.tentative_period = period;
   adaptive_struct.final_lb_period = period;
                        period:%d \n",CkMyPe(), adaptive_struct.lb_iteration_no, period));
   adaptive_struct.tentative_period = period;
   adaptive_struct.final_lb_period = period;
-  lbdatabase->MetaResumeWaitingChares(period);
+  lbdatabase->MetaLBResumeWaitingChares(period);
 }
 
 
 }