Changes to maintain the older scheme for isomalloc
[charm.git] / src / libs / ck-libs / armci / armci_vp.C
index 5887df6f5002b38b174d98484cc0dddbd14a2386..ac83a16d86519570a441b481f618937891ce2dad 100644 (file)
@@ -81,7 +81,9 @@ ArmciVirtualProcessor::ArmciVirtualProcessor(CkMigrateMessage *m)
 
 ArmciVirtualProcessor::~ArmciVirtualProcessor()
 {
-  //CmiIsomallocBlockListDelete(memBlock);
+#if !CMK_USE_MEMPOOL_ISOMALLOC
+  CmiIsomallocBlockListDelete(memBlock);
+#endif
   if (addressReply) {delete addressReply;}
 }
 
@@ -562,8 +564,11 @@ void ArmciVirtualProcessor::notify_wait(int proc){
 void ArmciVirtualProcessor::pup(PUP::er &p) {
   TCharmClient1D::pup(p);
   //Copying only address, the mempool will be pupped as part of the thread
-  //CmiIsomallocBlockListPup(&p, &memBlock, thread->getThread());
+#if CMK_USE_MEMPOOL_ISOMALLOC
   pup_bytes(&p, &memBlock, sizeof(CmiIsomallocBlockList*));
+#else
+  CmiIsomallocBlockListPup(&p, &memBlock, NULL);
+#endif
   p|thisProxy;
   p|hdlList;
   p|noteList;