Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@illinois.edu>
Wed, 30 Mar 2011 14:49:10 +0000 (09:49 -0500)
committerGengbin Zheng <gzheng@illinois.edu>
Wed, 30 Mar 2011 14:49:10 +0000 (09:49 -0500)
src/ck-core/ckevacuation.C
src/ck-core/ckevacuation.h
src/ck-core/cklocation.C
src/ck-core/init.C
src/libs/ck-libs/tcharm/Make.depends
src/libs/ck-libs/tcharm/Makefile
src/libs/ck-libs/tcharm/tcharm.C

index 6abcf94f71cb3d33e656d31cec1685624c160f67..3ee4799764507050246405ee3f2c64f8fa201288 100644 (file)
@@ -128,7 +128,7 @@ void CkEvacuatedElement(){
        if(!CpvAccess(_validProcessors)[CkMyPe()]){
                return;
        }
-       if(!CpvAccess(startedEvac)){
+       if(!CkpvAccess(startedEvac)){
                return;
        }
        remainingElements=0;
@@ -183,7 +183,7 @@ void CkClearAllArrayElements(){
        numEvacuated=0;
 //     evacTime = CmiWallTimer();
        printf("[%d] <%.6lf> Start Evacuation \n",CkMyPe(),evacTime);
-       CpvAccess(startedEvac)=1;
+       CkpvAccess(startedEvac)=1;
        //      Make sure the broadcase serializer changes
        if(CkMyPe() == CpvAccess(serializer)){
                CpvAccess(serializer) = getNextSerializer();
index b0d4315bfad7bff4556a4621c91b8a0c0ee57274..24d2cf9349b3ac4b5feedcd87acec43504a9a80e 100644 (file)
@@ -18,7 +18,7 @@ struct evacMsg{
 CpvCExtern(char *,_validProcessors);
 extern int _ckEvacBcastIdx;
 extern int _ckAckEvacIdx;
-CpvExtern(char ,startedEvac);
+CkpvExtern(char ,startedEvac);
 extern int allowMessagesOnly;
 extern int evacuate; //Evacuate flag, set to 0 normally. set to 1 when the SIGUSR1 signal is received. after the startedEvac flag has been set it is set to 2
 
index 859d148b35e7de7787b72f93316f86b49b9e77ba..e350390462c11fa2f258c85003f98395177d8b17 100644 (file)
@@ -219,7 +219,7 @@ public:
     if (i.nInts==1) {
       //Map 1D integer indices in simple round-robin fashion
       int ans= (i.data()[0])%CkNumPes();
-      while(!CmiNodeAlive(ans) || (ans == CkMyPe() && CpvAccess(startedEvac))){
+      while(!CmiNodeAlive(ans) || (ans == CkMyPe() && CkpvAccess(startedEvac))){
         ans = (ans +1 )%CkNumPes();
       }
       return ans;
@@ -2709,7 +2709,7 @@ void CkLocMgr::immigrate(CkArrayElementMigrateMessage *msg)
                Leave a record here mentioning the processor where it got sent
        */
        
-       if(CpvAccess(startedEvac)){
+       if(CkpvAccess(startedEvac)){
                int newhomePE = getNextPE(idx);
                DEBM((AA"Migrated into failed processor index size %s resent to %d \n"AB,idx2str(idx),newhomePE));      
                CkLocMgr *mgr = rec->getLocMgr();
index 26d46c14938d3c1fc1c97a479631744e06c7e6f9..864b458ccd6ab3ce830951a70dbd46cae74d2c03 100644 (file)
@@ -165,7 +165,7 @@ CkpvStaticDeclare(PtrVec*, _bocInitVec);
        FAULT_EVAC
 */
 CpvCExtern(char *, _validProcessors);
-CpvDeclare(char ,startedEvac);
+CkpvDeclare(char ,startedEvac);
 
 int    _exitHandlerIdx;
 
@@ -956,8 +956,8 @@ void _initCharm(int unused_argc, char **argv)
        */
 #ifndef __BLUEGENE__
        CpvInitialize(char *,_validProcessors);
-       CpvInitialize(char ,startedEvac);
 #endif
+       CkpvInitialize(char ,startedEvac);
        CpvInitialize(int,serializer);
 
        _initChareTables();            // for checkpointable plain chares
@@ -1191,10 +1191,10 @@ void _initCharm(int unused_argc, char **argv)
        for(int vProc=0;vProc<CkNumPes();vProc++){
                CpvAccess(_validProcessors)[vProc]=1;
        }
-       CpvAccess(startedEvac) = 0;
        _ckEvacBcastIdx = CkRegisterHandler((CmiHandler)_ckEvacBcast);
        _ckAckEvacIdx = CkRegisterHandler((CmiHandler)_ckAckEvac);
 #endif
+       CkpvAccess(startedEvac) = 0;
        CpvAccess(serializer) = 0;
 
        evacuate = 0;
index a8d3fc614be1eeda86027d09c50acc357deed13a..be6d0ed16b4d1c3285232fbfadf4333e2301584c 100644 (file)
 #generated by make depends
 tcharm.o: tcharm.C tcharm_impl.h ../../../../include/pup.h \
 ../../../../include/converse.h ../../../../include/conv-config.h \
 ../../../../include/conv-autoconfig.h ../../../../include/conv-common.h \
 ../../../../include/conv-mach.h ../../../../include/conv-mach-opt.h \
 ../../../../include/pup_c.h ../../../../include/queueing.h \
 ../../../../include/conv-cpm.h ../../../../include/conv-cpath.h \
 ../../../../include/conv-qd.h ../../../../include/conv-random.h \
 ../../../../include/conv-lists.h ../../../../include/conv-trace.h \
 ../../../../include/persistent.h ../../../../include/debug-conv.h \
 ../../../../include/pup_c.h ../../../../include/charm-api.h tcharmc.h \
 ../../../../include/cklists.h ../../../../include/pup.h \
 ../../../../include/memory-isomalloc.h tcharm.decl.h \
 ../../../../include/charm++.h ../../../../include/charm.h \
 ../../../../include/middle.h ../../../../include/middle-conv.h \
 ../../../../include/cklists.h ../../../../include/ckbitvector.h \
 ../../../../include/ckstream.h ../../../../include/init.h \
 ../../../../include/ckhashtable.h ../../../../include/debug-charm.h \
 ../../../../include/simd.h ../../../../include/CkMarshall.decl.h \
 ../../../../include/charm++.h ../../../../include/cksection.h \
 ../../../../include/ckcallback.h ../../../../include/conv-ccs.h \
 ../../../../include/sockRoutines.h ../../../../include/ccs-server.h \
 ../../../../include/ckobjQ.h ../../../../include/ckreduction.h \
 ../../../../include/CkReduction.decl.h \
 ../../../../include/cknodegroupreduction.h \
 ../../../../include/CkArrayReductionMgr.decl.h \
 ../../../../include/ckmemcheckpoint.h \
 ../../../../include/CkMemCheckpoint.decl.h \
 ../../../../include/readonly.h ../../../../include/ckarray.h \
 ../../../../include/cklocation.h ../../../../include/LBDatabase.h \
 ../../../../include/lbdb.h ../../../../include/LBDBManager.h \
 ../../../../include/LBObj.h ../../../../include/LBOM.h \
 ../../../../include/LBComm.h ../../../../include/LBMachineUtil.h \
 ../../../../include/lbdb++.h ../../../../include/LBDatabase.decl.h \
 ../../../../include/NullLB.decl.h ../../../../include/BaseLB.decl.h \
 ../../../../include/CkLocation.decl.h \
 ../../../../include/CkArray.decl.h ../../../../include/CkFutures.decl.h \
 ../../../../include/charisma.h ../../../../include/charisma.decl.h \
 ../../../../include/tempo.h ../../../../include/tempo.decl.h \
 ../../../../include/waitqd.h ../../../../include/waitqd.decl.h \
 ../../../../include/sdag.h ../../../../include/ckcheckpoint.h \
 ../../../../include/CkCheckpoint.decl.h \
 ../../../../include/ckevacuation.h \
 ../../../../include/ckarrayreductionmgr.h ../../../../include/trace.h \
 ../../../../include/trace-bluegene.h ../../../../include/envelope.h \
 tcharm.h ../../../../include/ckcheckpoint.h \
 ../../../../include/ckevacuation.h tcharm.def.h
+ ../../../../include/converse.h ../../../../include/conv-config.h \
+ ../../../../include/conv-autoconfig.h ../../../../include/conv-common.h \
+ ../../../../include/conv-mach.h ../../../../include/conv-mach-opt.h \
+ ../../../../include/pup_c.h ../../../../include/queueing.h \
+ ../../../../include/conv-cpm.h ../../../../include/conv-cpath.h \
+ ../../../../include/conv-qd.h ../../../../include/conv-random.h \
+ ../../../../include/conv-lists.h ../../../../include/conv-trace.h \
+ ../../../../include/persistent.h ../../../../include/debug-conv.h \
+ ../../../../include/pup_c.h ../../../../include/charm-api.h tcharmc.h \
+ ../../../../include/cklists.h ../../../../include/pup.h \
+ ../../../../include/memory-isomalloc.h tcharm.decl.h \
+ ../../../../include/charm++.h ../../../../include/charm.h \
+ ../../../../include/middle.h ../../../../include/middle-conv.h \
+ ../../../../include/cklists.h ../../../../include/ckbitvector.h \
+ ../../../../include/ckstream.h ../../../../include/init.h \
+ ../../../../include/ckhashtable.h ../../../../include/debug-charm.h \
+ ../../../../include/simd.h ../../../../include/CkMarshall.decl.h \
+ ../../../../include/charm++.h ../../../../include/cksection.h \
+ ../../../../include/ckcallback.h ../../../../include/conv-ccs.h \
+ ../../../../include/sockRoutines.h ../../../../include/ccs-server.h \
+ ../../../../include/ckobjQ.h ../../../../include/ckreduction.h \
+ ../../../../include/CkReduction.decl.h \
+ ../../../../include/cknodegroupreduction.h \
+ ../../../../include/CkArrayReductionMgr.decl.h \
+ ../../../../include/ckmemcheckpoint.h \
+ ../../../../include/CkMemCheckpoint.decl.h \
+ ../../../../include/readonly.h ../../../../include/ckarray.h \
+ ../../../../include/cklocation.h ../../../../include/LBDatabase.h \
+ ../../../../include/lbdb.h ../../../../include/LBDBManager.h \
+ ../../../../include/LBObj.h ../../../../include/LBOM.h \
+ ../../../../include/LBComm.h ../../../../include/LBMachineUtil.h \
+ ../../../../include/lbdb++.h ../../../../include/LBDatabase.decl.h \
+ ../../../../include/NullLB.decl.h ../../../../include/BaseLB.decl.h \
../../../../include/CkLocation.decl.h ../../../../include/CkArray.decl.h \
../../../../include/CkFutures.decl.h ../../../../include/charisma.h \
../../../../include/charisma.decl.h ../../../../include/tempo.h \
../../../../include/tempo.decl.h ../../../../include/waitqd.h \
../../../../include/waitqd.decl.h ../../../../include/sdag.h \
+ ../../../../include/ckcheckpoint.h \
+ ../../../../include/CkCheckpoint.decl.h \
+ ../../../../include/ckevacuation.h \
+ ../../../../include/ckarrayreductionmgr.h ../../../../include/trace.h \
+ ../../../../include/trace-bluegene.h ../../../../include/envelope.h \
+ tcharm.h ../../../../include/ckcheckpoint.h \
+ ../../../../include/ckevacuation.h tcharm.def.h
        $(CHARMC) -o tcharm.o tcharm.C
 tcharmmain.o: tcharmmain.C tcharm_impl.h ../../../../include/pup.h \
 ../../../../include/converse.h ../../../../include/conv-config.h \
 ../../../../include/conv-autoconfig.h ../../../../include/conv-common.h \
 ../../../../include/conv-mach.h ../../../../include/conv-mach-opt.h \
 ../../../../include/pup_c.h ../../../../include/queueing.h \
 ../../../../include/conv-cpm.h ../../../../include/conv-cpath.h \
 ../../../../include/conv-qd.h ../../../../include/conv-random.h \
 ../../../../include/conv-lists.h ../../../../include/conv-trace.h \
 ../../../../include/persistent.h ../../../../include/debug-conv.h \
 ../../../../include/pup_c.h ../../../../include/charm-api.h tcharmc.h \
 ../../../../include/cklists.h ../../../../include/pup.h \
 ../../../../include/memory-isomalloc.h tcharm.decl.h \
 ../../../../include/charm++.h ../../../../include/charm.h \
 ../../../../include/middle.h ../../../../include/middle-conv.h \
 ../../../../include/cklists.h ../../../../include/ckbitvector.h \
 ../../../../include/ckstream.h ../../../../include/init.h \
 ../../../../include/ckhashtable.h ../../../../include/debug-charm.h \
 ../../../../include/simd.h ../../../../include/CkMarshall.decl.h \
 ../../../../include/charm++.h ../../../../include/cksection.h \
 ../../../../include/ckcallback.h ../../../../include/conv-ccs.h \
 ../../../../include/sockRoutines.h ../../../../include/ccs-server.h \
 ../../../../include/ckobjQ.h ../../../../include/ckreduction.h \
 ../../../../include/CkReduction.decl.h \
 ../../../../include/cknodegroupreduction.h \
 ../../../../include/CkArrayReductionMgr.decl.h \
 ../../../../include/ckmemcheckpoint.h \
 ../../../../include/CkMemCheckpoint.decl.h \
 ../../../../include/readonly.h ../../../../include/ckarray.h \
 ../../../../include/cklocation.h ../../../../include/LBDatabase.h \
 ../../../../include/lbdb.h ../../../../include/LBDBManager.h \
 ../../../../include/LBObj.h ../../../../include/LBOM.h \
 ../../../../include/LBComm.h ../../../../include/LBMachineUtil.h \
 ../../../../include/lbdb++.h ../../../../include/LBDatabase.decl.h \
 ../../../../include/NullLB.decl.h ../../../../include/BaseLB.decl.h \
 ../../../../include/CkLocation.decl.h \
 ../../../../include/CkArray.decl.h ../../../../include/CkFutures.decl.h \
 ../../../../include/charisma.h ../../../../include/charisma.decl.h \
 ../../../../include/tempo.h ../../../../include/tempo.decl.h \
 ../../../../include/waitqd.h ../../../../include/waitqd.decl.h \
 ../../../../include/sdag.h ../../../../include/ckcheckpoint.h \
 ../../../../include/CkCheckpoint.decl.h \
 ../../../../include/ckevacuation.h \
 ../../../../include/ckarrayreductionmgr.h ../../../../include/trace.h \
 ../../../../include/trace-bluegene.h ../../../../include/envelope.h \
 tcharm.h ../../../../include/ckcheckpoint.h tcharmmain.decl.h \
 tcharmmain.def.h
+ ../../../../include/converse.h ../../../../include/conv-config.h \
+ ../../../../include/conv-autoconfig.h ../../../../include/conv-common.h \
+ ../../../../include/conv-mach.h ../../../../include/conv-mach-opt.h \
+ ../../../../include/pup_c.h ../../../../include/queueing.h \
+ ../../../../include/conv-cpm.h ../../../../include/conv-cpath.h \
+ ../../../../include/conv-qd.h ../../../../include/conv-random.h \
+ ../../../../include/conv-lists.h ../../../../include/conv-trace.h \
+ ../../../../include/persistent.h ../../../../include/debug-conv.h \
+ ../../../../include/pup_c.h ../../../../include/charm-api.h tcharmc.h \
+ ../../../../include/cklists.h ../../../../include/pup.h \
+ ../../../../include/memory-isomalloc.h tcharm.decl.h \
+ ../../../../include/charm++.h ../../../../include/charm.h \
+ ../../../../include/middle.h ../../../../include/middle-conv.h \
+ ../../../../include/cklists.h ../../../../include/ckbitvector.h \
+ ../../../../include/ckstream.h ../../../../include/init.h \
+ ../../../../include/ckhashtable.h ../../../../include/debug-charm.h \
+ ../../../../include/simd.h ../../../../include/CkMarshall.decl.h \
+ ../../../../include/charm++.h ../../../../include/cksection.h \
+ ../../../../include/ckcallback.h ../../../../include/conv-ccs.h \
+ ../../../../include/sockRoutines.h ../../../../include/ccs-server.h \
+ ../../../../include/ckobjQ.h ../../../../include/ckreduction.h \
+ ../../../../include/CkReduction.decl.h \
+ ../../../../include/cknodegroupreduction.h \
+ ../../../../include/CkArrayReductionMgr.decl.h \
+ ../../../../include/ckmemcheckpoint.h \
+ ../../../../include/CkMemCheckpoint.decl.h \
+ ../../../../include/readonly.h ../../../../include/ckarray.h \
+ ../../../../include/cklocation.h ../../../../include/LBDatabase.h \
+ ../../../../include/lbdb.h ../../../../include/LBDBManager.h \
+ ../../../../include/LBObj.h ../../../../include/LBOM.h \
+ ../../../../include/LBComm.h ../../../../include/LBMachineUtil.h \
+ ../../../../include/lbdb++.h ../../../../include/LBDatabase.decl.h \
+ ../../../../include/NullLB.decl.h ../../../../include/BaseLB.decl.h \
../../../../include/CkLocation.decl.h ../../../../include/CkArray.decl.h \
../../../../include/CkFutures.decl.h ../../../../include/charisma.h \
../../../../include/charisma.decl.h ../../../../include/tempo.h \
../../../../include/tempo.decl.h ../../../../include/waitqd.h \
../../../../include/waitqd.decl.h ../../../../include/sdag.h \
+ ../../../../include/ckcheckpoint.h \
+ ../../../../include/CkCheckpoint.decl.h \
+ ../../../../include/ckevacuation.h \
+ ../../../../include/ckarrayreductionmgr.h ../../../../include/trace.h \
+ ../../../../include/trace-bluegene.h ../../../../include/envelope.h \
+ tcharm.h ../../../../include/ckcheckpoint.h tcharmmain.decl.h \
+ tcharmmain.def.h
        $(CHARMC) -o tcharmmain.o tcharmmain.C
 compat_uns.o: compat_uns.c ../../../../include/charm-api.h \
 ../../../../include/conv-config.h ../../../../include/conv-autoconfig.h \
 ../../../../include/conv-common.h ../../../../include/conv-mach.h \
 ../../../../include/conv-mach-opt.h tcharmc.h \
 ../../../../include/pup_c.h
+ ../../../../include/conv-config.h ../../../../include/conv-autoconfig.h \
+ ../../../../include/conv-common.h ../../../../include/conv-mach.h \
+ ../../../../include/conv-mach-opt.h tcharmc.h \
+ ../../../../include/pup_c.h
        $(CHARMC) -o compat_uns.o compat_uns.c
 compat_us.o: compat_us.c ../../../../include/charm-api.h \
 ../../../../include/conv-config.h ../../../../include/conv-autoconfig.h \
 ../../../../include/conv-common.h ../../../../include/conv-mach.h \
 ../../../../include/conv-mach-opt.h tcharmc.h \
 ../../../../include/pup_c.h
+ ../../../../include/conv-config.h ../../../../include/conv-autoconfig.h \
+ ../../../../include/conv-common.h ../../../../include/conv-mach.h \
+ ../../../../include/conv-mach-opt.h tcharmc.h \
+ ../../../../include/pup_c.h
        $(CHARMC) -o compat_us.o compat_us.c
 compat_funs.o: compat_funs.c ../../../../include/charm-api.h \
 ../../../../include/conv-config.h ../../../../include/conv-autoconfig.h \
 ../../../../include/conv-common.h ../../../../include/conv-mach.h \
 ../../../../include/conv-mach-opt.h tcharmc.h \
 ../../../../include/pup_c.h
+ ../../../../include/conv-config.h ../../../../include/conv-autoconfig.h \
+ ../../../../include/conv-common.h ../../../../include/conv-mach.h \
+ ../../../../include/conv-mach-opt.h tcharmc.h \
+ ../../../../include/pup_c.h
        $(CHARMC) -o compat_funs.o compat_funs.c
 compat_fus.o: compat_fus.c ../../../../include/charm-api.h \
 ../../../../include/conv-config.h ../../../../include/conv-autoconfig.h \
 ../../../../include/conv-common.h ../../../../include/conv-mach.h \
 ../../../../include/conv-mach-opt.h tcharmc.h \
 ../../../../include/pup_c.h
+ ../../../../include/conv-config.h ../../../../include/conv-autoconfig.h \
+ ../../../../include/conv-common.h ../../../../include/conv-mach.h \
+ ../../../../include/conv-mach-opt.h tcharmc.h \
+ ../../../../include/pup_c.h
        $(CHARMC) -o compat_fus.o compat_fus.c
 compat_regmm.o: compat_regmm.c ../../../../include/charm-api.h \
 ../../../../include/conv-config.h ../../../../include/conv-autoconfig.h \
 ../../../../include/conv-common.h ../../../../include/conv-mach.h \
 ../../../../include/conv-mach-opt.h
+ ../../../../include/conv-config.h ../../../../include/conv-autoconfig.h \
+ ../../../../include/conv-common.h ../../../../include/conv-mach.h \
+ ../../../../include/conv-mach-opt.h
        $(CHARMC) -o compat_regmm.o compat_regmm.c
-tcharm.decl.h tcharm.def.h: tcharm.ci.stamp
-tcharm.ci.stamp: tcharm.ci ../../../../tmp/charmxi
-        $(CHARMC) -intrinsic $< && touch $@
-tcharmmain.decl.h tcharmmain.def.h: tcharmmain.ci.stamp
-tcharmmain.ci.stamp: tcharmmain.ci ../../../../tmp/charmxi
-        $(CHARMC) -intrinsic $< && touch $@
index e00f82cfc5dae0075a5bfc744b44c3647187ec19..05c391509bb69899800bca7846e0f34857010b9d 100644 (file)
@@ -34,6 +34,12 @@ $(DEST2): $(OBJS2) $(HEADERS)
 $(COMPATLIB): $(COMPAT) 
        $(CHARMC) $(COMPAT) -o $@
 
+tcharm.decl.h : tcharm.ci $(CDIR)/bin/charmxi
+       $(CHARMC) -c tcharm.ci
+
+tcharmmain.decl.h : tcharmmain.ci $(CDIR)/bin/charmxi
+       $(CHARMC) -c tcharmmain.ci
+
 headers: $(HEADERS)
 
 clean: 
@@ -60,9 +66,5 @@ depends:  $(CIFILES)
               g++ -MM -Wno-deprecated -I$(CHARMINC) $$SRCFILE >> $(DEPENDFILE); \
               echo '   $$(CHARMC) -o '$$i $$SRCFILE >> $(DEPENDFILE) ; \
         done; \
-       for cifile in $(wildcard *.ci); do \
-              echo "checking generated modules for $$cifile" ; \
-              $(CHARMXI) -intrinsic -M $$cifile | sed '/\.stamp:/a \\t $$(CHARMC) -intrinsic $$< && touch $$@' >> $(DEPENDFILE) ; \
-        done
 
 
index 66a4e9637ac3ab949b31798e5308a5310d65c402..9b0175b068a9ac582d3add902c2d424291bea454 100644 (file)
@@ -508,7 +508,7 @@ void TCharm::evacuate(){
                FAULT_EVAC
        */
        //CkClearAllArrayElementsCPP();
-       if(CpvAccess(startedEvac)){
+       if(CkpvAccess(startedEvac)){
                int nextPE = getNextPE(CkArrayIndex1D(thisIndex));
 //             resumeAfterMigration=true;
                CcdCallFnAfter((CcdVoidFn)CkEmmigrateElement, (void *)myRec, 1);