Merge branch 'charm' of charmgit:charm into xiang/optChkp
authorXiang Ni <xiangni2@illinois.edu>
Wed, 24 Oct 2012 17:18:26 +0000 (12:18 -0500)
committerXiang Ni <xiangni2@illinois.edu>
Wed, 24 Oct 2012 17:18:26 +0000 (12:18 -0500)
Conflicts:
src/ck-core/cklocation.C
src/ck-ldb/GreedyLB.C
src/conv-core/convcore.c

1  2 
src/ck-core/ckcheckpoint.C
src/ck-core/cklocation.C
src/ck-core/cklocation.h
src/ck-core/ckmemcheckpoint.C
src/ck-ldb/CentralLB.C
src/ck-ldb/HybridBaseLB.C
src/conv-core/convcore.c

Simple merge
index 91d0602fbd008ab3a7f1f8d4cf8962b682cb3ade,d1d87ef0e8decb31e196b228c3ac6e7ba007a5e7..06d1644a8b059ab27811a10a7ad7b0ed0e438853
@@@ -1992,8 -2117,9 +2143,8 @@@ void CkLocMgr::pup(PUP::er &p)
                  CkArrayIndex emptyIndex;
                map->registerArray(emptyIndex,thisgroup);
                // _lbdb is the fixed global groupID
-               initLB(lbdbID);
+               initLB(lbdbID, metalbID);
 -
 -#if (defined(_FAULT_MLOG_) || defined(_FAULT_CAUSAL_))     
 +#if (defined(_FAULT_MLOG_) || defined(_FAULT_CAUSAL_)) ||CMK_MEM_CHECKPOINT    
          int count;
          p | count;
          DEBUG(CmiPrintf("[%d] Unpacking Locmgr %d has %d home elements\n",CmiMyPe(),thisgroup.idx,count));
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge