More bug fixes
authorNikhil Jain <nikhil@illinois.edu>
Fri, 18 Nov 2011 19:52:27 +0000 (13:52 -0600)
committerNikhil Jain <nikhil@illinois.edu>
Fri, 18 Nov 2011 19:52:27 +0000 (13:52 -0600)
src/conv-core/global-elfcopy.C
src/conv-core/global-elfgot.C
src/conv-core/isomalloc.c
src/libs/ck-libs/armci/armci_impl.h
src/libs/ck-libs/tcharm/tcharm.C

index fe5ed955544cd8d2be637166d20d0580550dc362..7e48e5b3d094dc64996082ba0ec5184e08adc3df 100644 (file)
@@ -227,7 +227,7 @@ struct CtgGlobalStruct {
       seg_size=size;
       /* global data segment need to be isomalloc */
       if (CmiMemoryIs(CMI_MEMORY_IS_ISOMALLOC))
-        data_seg=CmiIsomalloc(seg_size);
+        data_seg=CmiIsomalloc(seg_size,NULL);
       else
         data_seg=malloc(seg_size);
       inited = 0;
index 118af464b23a098c24e92b92f819fcaabe915df0..cd270e688e65637d9ba4d38efbeadfb04e4132bc 100644 (file)
@@ -374,7 +374,7 @@ public:
       seg_size=size;
         /* global data segment need to be isomalloc */
       if (CmiMemoryIs(CMI_MEMORY_IS_ISOMALLOC))
-        data_seg=CmiIsomalloc(seg_size);
+        data_seg=CmiIsomalloc(seg_size,NULL);
       else
         data_seg=malloc(seg_size);
     }
index c16c364b37e87604e7fa2a4dbbd9a7cf2ac9621f..93fa35534f81cd7d997ae6ee76314ea504dac04b 100644 (file)
@@ -2022,7 +2022,11 @@ static void init_ranges(char **argv)
   int pagesize = 0;
 
   /*Round slot size up to nearest page size*/
+#if USE_MEMPOOL_ISOMALLOC
   slotsize=1024*1024;
+#else
+  slotsize=16*1024;
+#endif 
 #if CMK_HAS_GETPAGESIZE
   pagesize = getpagesize();
 #endif
@@ -2443,7 +2447,6 @@ void CmiIsomallocFree(void *blockPtr)
   {
 #if USE_MEMPOOL_ISOMALLOC
     mempool_free_thread((void*)pointer2block(blockPtr)->slot);
-    //mempool_free(CtvAccess(threadpool), (void*)pointer2block(blockPtr)->slot);
 #else
     CmiIsomallocBlock *blk=pointer2block(blockPtr);
     CmiInt8 s=blk->slot; 
index a2d769350c5790e5a5f5e1b3ff3903a4e17b0145..f6a952e633d9e47bd503e4dd538221122978b464 100644 (file)
@@ -239,8 +239,10 @@ class ArmciVirtualProcessor : public TCharmClient1D {
   ArmciVirtualProcessor(const CProxy_TCharm &_thr_proxy);
   ArmciVirtualProcessor(CkMigrateMessage *m);
   ~ArmciVirtualProcessor();
-  
-  pointer BlockMalloc(int bytes) { return (void *)CmiIsomallocBlockListMalloc(memBlock, bytes); }
+  pointer BlockMalloc(int bytes) { 
+    return (void *)CmiIsomallocBlockListMalloc(memBlock, bytes); 
+  }
   void getAddresses(AddressMsg *msg);
 
   void put(pointer src, pointer dst, int bytes, int dst_proc);
index 856c61aca71c9dfb2a5e0743e1378c8ae811b438..c51c8c136e01974567e4a47f09db79f616489bd9 100644 (file)
@@ -366,8 +366,10 @@ TCharm::~TCharm()
 {
   //BIGSIM_OOC DEBUGGING
   //CmiPrintf("TCharm destructor called with heapBlocks=%p!\n", heapBlocks);
-   
-  //if (heapBlocks) CmiIsomallocBlockListDelete(heapBlocks);
+  
+#if !USE_MEMPOOL_ISOMALLOC
+  if (heapBlocks) CmiIsomallocBlockListDelete(heapBlocks);
+#endif
   CthFree(tid);
   CtgFree(threadGlobals);
   delete initMsg;