Merge branch 'charm' of charmgit:charm into charm
authorJonathan Lifflander <jliffl2@illinois.edu>
Sat, 25 May 2013 05:07:40 +0000 (00:07 -0500)
committerJonathan Lifflander <jliffl2@illinois.edu>
Sat, 25 May 2013 05:07:40 +0000 (00:07 -0500)
1  2 
src/ck-core/charm++.h
src/ck-core/ck.C
src/ck-core/ckarray.C
src/ck-core/ckarray.h
src/ck-core/cklocation.C
src/ck-core/init.C
src/ck-ldb/lbdb.h
src/libs/ck-libs/multicast/ckmulticast.C
src/xlat-i/xi-symbol.C

Simple merge
Simple merge
Simple merge
Simple merge
index 0af5fd4ab2e7d297935d351405c1ee617af50854,411405e9bde4b27a4f81c8c43b2c9ef0e0515238..5888e525397de57d0e6989562ea3a7c7e404a5e3
@@@ -1410,13 -1413,13 +1412,13 @@@ CkLocRec_local::CkLocRec_local(CkLocMg
        //BIGSIM_OOC DEBUGGING
        //CkPrintf("LocMgr on %d: Registering element %s with load balancer\n", CkMyPe(), idx2str(idx));
        nextPe = -1;
-       asyncMigrate = CmiFalse;
-       readyMigrate = CmiTrue;
-         enable_measure = CmiTrue;
-       bounced  = CmiFalse;
+       asyncMigrate = false;
+       readyMigrate = true;
+         enable_measure = true;
+       bounced  = false;
        the_lbdb=mgr->getLBDB();
        the_metalb=mgr->getMetaBalancer();
 -      LDObjid ldid = idx2LDObjid(idx);
 +      LDObjid ldid = idx2LDObjid(idx, mgr->getGroupID());
  #if CMK_GLOBAL_LOCATION_UPDATE
          ldid.locMgrGid = mgr->getGroupID().idx;
  #endif        
@@@ -1537,10 -1540,9 +1539,10 @@@ LDObjHandle CkMigratable::timingBeforeC
        }
        myRec->startTiming(1);
  #endif
 +        CkpvAccess(_runningChare) = static_cast<Chare*>(this);
  
    //DEBS((AA"   Invoking entry %d on element %s\n"AB,epIdx,idx2str(idx)));
-       //CmiBool isDeleted=CmiFalse; //Enables us to detect deletion during processing
+       //bool isDeleted=false; //Enables us to detect deletion during processing
        //deletedMarker=&isDeleted;
  /*#ifndef CMK_OPTIMIZE
        if (msg) {  Tracing: 
@@@ -1586,10 -1588,10 +1588,10 @@@ bool CkLocRec_local::invokeEntry(CkMigr
  {
  
        DEBS((AA"   Invoking entry %d on element %s\n"AB,epIdx,idx2str(idx)));
-       CmiBool isDeleted=CmiFalse; //Enables us to detect deletion during processing
+       bool isDeleted=false; //Enables us to detect deletion during processing
        deletedMarker=&isDeleted;
        startTiming();
 -
 +        CkpvAccess(_runningChare) = static_cast<Chare*>(obj);
  
  #if CMK_TRACE_ENABLED
        if (msg) { /* Tracing: */
  #if CMK_LBDB_ON
          if (!isDeleted) checkBufferedMigration();   // check if should migrate
  #endif
-       if (isDeleted) return CmiFalse;//We were deleted
+       if (isDeleted) return false;//We were deleted
        deletedMarker=NULL;
 +        CkpvAccess(_runningChare) = 0;
        stopTiming();
-       return CmiTrue;
+       return true;
  }
  
CmiBool CkLocRec_local::deliver(CkArrayMessage *msg,CkDeliver_t type,int opts)
bool CkLocRec_local::deliver(CkArrayMessage *msg,CkDeliver_t type,int opts)
  {
  
        if (type==CkDeliver_queue) { /*Send via the message queue */
Simple merge
Simple merge
Simple merge