X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/33ddb437e6bde48be352567465673636f1745188..cb8c69ffa2625f5d14255ede0a59d9ab964bffab:/src/xbt/mmalloc/mrealloc.c

diff --git a/src/xbt/mmalloc/mrealloc.c b/src/xbt/mmalloc/mrealloc.c
index 9b0e907eaf..0e03a922e2 100644
--- a/src/xbt/mmalloc/mrealloc.c
+++ b/src/xbt/mmalloc/mrealloc.c
@@ -20,44 +20,48 @@
    new region.  This module has incestuous knowledge of the
    internals of both mfree and mmalloc. */
 
-void *mrealloc(void *md, void *ptr, size_t size)
+void *mrealloc(xbt_mheap_t mdp, void *ptr, size_t size)
 {
-  struct mdesc *mdp;
   void *result;
   int type;
   size_t block, blocks, oldlimit;
 
+  /* Only keep real realloc and hidden malloc and free to the relevant functions */
   if (size == 0) {
-    mfree(md, ptr);
-    return (mmalloc(md, 0));
+	fprintf(stderr,"free from realloc...");
+    mfree(mdp, ptr);
+    fprintf(stderr,"done\n");
+    return mmalloc(mdp, 0);
   } else if (ptr == NULL) {
-    return (mmalloc(md, size));
+    return mmalloc(mdp, size);
   }
 
-  mdp = MD_TO_MDP(md);
-
   //printf("(%s)realloc %p to %d...",xbt_thread_self_name(),ptr,(int)size);
 
   if ((char *) ptr < (char *) mdp->heapbase || BLOCK(ptr) > mdp->heapsize) {
     printf
         ("FIXME. Ouch, this pointer is not mine, refusing to proceed (another solution would be to malloc it instead of reallocing it, see source code)\n");
-    result = mmalloc(md, size);
+    result = mmalloc(mdp, size);
     abort();
     return result;
   }
 
   block = BLOCK(ptr);
 
-  type = mdp->heapinfo[block].busy.type;
+  type = mdp->heapinfo[block].type;
+  if (type<0)
+      THROWF(arg_error,0,"Asked realloc a fragment comming from a *free* block. I'm puzzled.");
+
   switch (type) {
   case 0:
     /* Maybe reallocate a large block to a small fragment.  */
-    if (size <= BLOCKSIZE / 2) {
-      //printf("(%s) alloc large block...",xbt_thread_self_name());
-      result = mmalloc(md, size);
-      if (result != NULL) {
+
+    if (size <= BLOCKSIZE / 2) { // Full block -> Fragment; no need to optimize for time
+
+      result = mmalloc(mdp, size);
+      if (result != NULL) { // useless (mmalloc never returns NULL), but harmless
         memcpy(result, ptr, size);
-        mfree(md, ptr);
+        mfree(mdp, ptr);
         return (result);
       }
     }
@@ -65,32 +69,35 @@ void *mrealloc(void *md, void *ptr, size_t size)
     /* The new size is a large allocation as well;
        see if we can hold it in place. */
     blocks = BLOCKIFY(size);
-    if (blocks < mdp->heapinfo[block].busy.info.block.size) {
+    if (blocks < mdp->heapinfo[block].busy_block.size) {
+    	int it;
       /* The new size is smaller; return excess memory to the free list. */
       //printf("(%s) return excess memory...",xbt_thread_self_name());
-      mdp->heapinfo[block + blocks].busy.type = 0;
-      mdp->heapinfo[block + blocks].busy.info.block.size
-          = mdp->heapinfo[block].busy.info.block.size - blocks;
-      mdp->heapinfo[block].busy.info.block.size = blocks;
-      mdp->heapinfo[block].busy.info.block.busy_size = size;
-      mfree(md, ADDRESS(block + blocks));
+     for (it= block+blocks; it< mdp->heapinfo[block].busy_block.size ; it++)
+    	 mdp->heapinfo[it].type = 0;
+      mdp->heapinfo[block + blocks].busy_block.size
+          = mdp->heapinfo[block].busy_block.size - blocks;
+      mdp->heapinfo[block].busy_block.size = blocks;
+      mdp->heapinfo[block].busy_block.busy_size = size;
+
+      mfree(mdp, ADDRESS(block + blocks));
       result = ptr;
-    } else if (blocks == mdp->heapinfo[block].busy.info.block.size) {
+    } else if (blocks == mdp->heapinfo[block].busy_block.size) {
       /* No size change necessary.  */
       result = ptr;
     } else {
       /* Won't fit, so allocate a new region that will.
          Free the old region first in case there is sufficient
          adjacent free space to grow without moving. */
-      blocks = mdp->heapinfo[block].busy.info.block.size;
+      blocks = mdp->heapinfo[block].busy_block.size;
       /* Prevent free from actually returning memory to the system.  */
       oldlimit = mdp->heaplimit;
       mdp->heaplimit = 0;
-      mfree(md, ptr);
+      mfree(mdp, ptr);
       mdp->heaplimit = oldlimit;
-      result = mmalloc(md, size);
+      result = mmalloc(mdp, size);
       if (result == NULL) {
-        mmalloc(md, blocks * BLOCKSIZE);
+        mmalloc(mdp, blocks * BLOCKSIZE);
         return (NULL);
       }
       if (ptr != result)
@@ -110,12 +117,12 @@ void *mrealloc(void *md, void *ptr, size_t size)
          and copy the lesser of the new size and the old. */
       //printf("(%s) new size is different...",xbt_thread_self_name());
 
-      result = mmalloc(md, size);
+      result = mmalloc(mdp, size);
       if (result == NULL)
         return (NULL);
 
       memcpy(result, ptr, MIN(size, (size_t) 1 << type));
-      mfree(md, ptr);
+      mfree(mdp, ptr);
     }
     break;
   }