Fixing some bugs in isomalloc and threads
authorNikhil Jain <nikhil@illinois.edu>
Wed, 12 Oct 2011 03:51:04 +0000 (22:51 -0500)
committerNikhil Jain <nikhil@illinois.edu>
Wed, 12 Oct 2011 03:51:04 +0000 (22:51 -0500)
src/conv-core/isomalloc.c
src/conv-core/threads.c

index 0b4b317ae0d30404a37bb9a6577a1f95829e3cda..4903e675eca5b8ddb8877c2b4eaecd9084cc6008 100644 (file)
@@ -2539,7 +2539,7 @@ void CmiIsomallocBlockListPup(pup_er p,CmiIsomallocBlockList **lp, CthThread tid
   mempool_block *current, *mempools_head;
   void *newblock;
   CmiInt8 slot;
-  CmiInt8 size;
+  int size;
   int i, numBlocks = 0;
 
   if(!pup_isUnpacking(p)) {
@@ -2557,7 +2557,7 @@ void CmiIsomallocBlockListPup(pup_er p,CmiIsomallocBlockList **lp, CthThread tid
     pup_int(p,&numBlocks);
     current = &(CtvAccessOther(tid,threadpool)->mempools_head);
     while(current != NULL) {
-      pup_int8(p,&current->size);
+      pup_int(p,&current->size);
       pup_int8(p,&current->mem_hndl);
       pup_bytes(p,current->mempool_ptr,current->size);
 #if ISOMALLOC_DEBUG
@@ -2573,7 +2573,7 @@ void CmiIsomallocBlockListPup(pup_er p,CmiIsomallocBlockList **lp, CthThread tid
     printf("Number of blocks to be unpacked %d\n",numBlocks);
 #endif
     for(i = 0; i < numBlocks; i++) { 
-      pup_int8(p,&size);
+      pup_int(p,&size);
       pup_int8(p,&slot);
       newblock = map_slots(slot,size/slotsize);
       pup_bytes(p,newblock,size);
index 9107f2ee13269c97f9aa4f9f017b452791e105dd..e5b3e9266c7a771932c33373444319aece12fffb 100644 (file)
@@ -630,7 +630,6 @@ void CthPupBase(pup_er p,CthThreadBase *t,int useMigratable)
 #endif
   /* printf("[%d] %s %p\n", CmiMyPe(), pup_typeString(p), t->tlsseg.memseg); */
 #endif
-#endif
 }
 
 static void CthThreadFinished(CthThread t)