revert changes in CmiCopyArgs and LB
authorXiang Ni <xiangni2@illinois.edu>
Thu, 28 Mar 2013 19:42:36 +0000 (14:42 -0500)
committerXiang Ni <xiangni2@illinois.edu>
Thu, 28 Mar 2013 19:42:36 +0000 (14:42 -0500)
src/ck-ldb/LBDBManager.C
src/conv-core/convcore.c

index 01d0be4d59e251323797868bfd337867e6c37fcf..aa1bebf45848dd73f52ebcbe21fb9d85eedf76a8 100644 (file)
@@ -36,7 +36,7 @@ void LBDB::batsyncer::resumeFromSync(void *bs)
   s->nextT = curT + s->period;
 #endif
 
   s->nextT = curT + s->period;
 #endif
 
-  CcdCallFnAfterOnPE((CcdVoidFn)gotoSync, (void *)s, 10000000000*s->period, CkMyPe());
+  CcdCallFnAfterOnPE((CcdVoidFn)gotoSync, (void *)s, 1000*s->period, CkMyPe());
 }
 
 // initPeriod in seconds
 }
 
 // initPeriod in seconds
index 7db2ccca91fcc49d33aea6f5545aee0de03d47ee..6f420f4ac8f424ade87b8a78af5296856d300a22 100644 (file)
@@ -349,9 +349,10 @@ char **CmiCopyArgs(char **argv)
        char **ret=(char **)malloc(sizeof(char *)*(argc+1));
        int i;
        for (i=0;i<argc;i++) {
        char **ret=(char **)malloc(sizeof(char *)*(argc+1));
        int i;
        for (i=0;i<argc;i++) {
-               //printf("Copyin argc %d/%d of lenght %d\n",i,argc,strlen(argv[i]));
-               ret[i] = (char*)malloc(strlen(argv[i])*sizeof(char));
-               memcpy(ret[i],argv[i],strlen(argv[i])*sizeof(char)); 
+       //      printf("Copyin argc %d/%d of lenght %d %s\n",i,argc,strlen(argv[i]), argv[i]);
+       //      ret[i] = (char*)malloc(strlen(argv[i])*sizeof(char));
+       //      memcpy(ret[i],argv[i],strlen(argv[i])*sizeof(char)); 
+          ret[i] = argv[i];
        }
        return ret;
 }
        }
        return ret;
 }