merge charm
authorXiang Ni <xiangni2@illinois.edu>
Wed, 24 Oct 2012 18:17:08 +0000 (13:17 -0500)
committerXiang Ni <xiangni2@illinois.edu>
Wed, 24 Oct 2012 18:17:08 +0000 (13:17 -0500)
src/ck-core/cklocation.C
src/ck-core/ckmemcheckpoint.C
src/conv-core/convcore.c

index 06d1644a8b059ab27811a10a7ad7b0ed0e438853..4134e9935e1c8770a6361113609a23b40d934add 100644 (file)
@@ -2031,26 +2031,6 @@ void CkLocMgr::flushAllRecs(void)
 }
 
 
-void CkLocMgr::checkpointRemoteIdx(PUP::er &p)
-{
-  void *objp;
-  void *keyp;
-  int flag = 0;
-  CkHashtableIterator *it=hash.iterator();
-  CmiImmediateLock(hashImmLock);
-  while (NULL!=(objp=it->next(&keyp))) {
-    CkLocRec *rec=*(CkLocRec **)objp;
-    if (rec->type() != CkLocRec::local) {
-      CkArrayIndexMax &idx=*(CkArrayIndex *)keyp;
-      p|idx;
-      int onPe = ((CkLocRec_remote *)rec)->lookupProcessor();
-      p|onPe;
-      flag++;
-    }
-  }
- // CkPrintf("[%d] has %d remote elements\n",CkMyPe(),flag);
-}
-
 #if (defined(_FAULT_MLOG_) || defined(_FAULT_CAUSAL_))
 void CkLocMgr::callForAllRecords(CkLocFn fnPointer,CkArray *arr,void *data){
        void *objp;
index ea9364153cb12bc1d12c0fdadfc522fdff81dace..f2775937cb56c5aef60eaec7f92b4c763acbb454 100644 (file)
@@ -513,7 +513,7 @@ class MemElementPacker : public CkLocIterator{
 };
 
 void CkMemCheckPT::pupAllElements(PUP::er &p){
-#if CMK_CHKP_ALL
+#if CMK_CHKP_ALL && CMK_MEM_CHECKPOINT
        int numElements;
        if(!p.isUnpacking()){
                numElements = CkCountArrayElements();
@@ -1268,7 +1268,6 @@ static void restartBcastHandler(char *msg)
 }
 
 extern void _initDone();
-#include "hwi/include/bqc/A2_inlines.h"
 
 // called on crashed processor
 static void recoverProcDataHandler(char *msg)
index 3a23e4d9fa31389e99884cba8612f714e469ef7b..cee4024cbfd166aac3bc65cb44b859641a5410ec 100644 (file)
@@ -1260,8 +1260,7 @@ double CmiWallTimer()
 {
   unsigned long long currenttime;
   currenttime = GetTimeBase();
-  //return CpvAccess(clocktick)*(currenttime-CpvAccess(inittime));
-  return CpvAccess(clocktick)*(currenttime);
+  return CpvAccess(clocktick)*(currenttime-CpvAccess(inittime));
 }
 
 double CmiCpuTimer()