kill dupplicated code between legacy interface and actual implementations

[simgrid.git] / src / xbt / mmalloc / mrealloc.c

diff --git a/src/xbt/mmalloc/mrealloc.c b/src/xbt/mmalloc/mrealloc.c
index 38f2031..3dd60c2 100644 (file)
--- a/src/xbt/mmalloc/mrealloc.c
+++ b/src/xbt/mmalloc/mrealloc.c
@@ -9,6 +9,7 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include <string.h>             /* Prototypes for memcpy, memmove, memset, etc */
+#include <stdlib.h> /* abort */
 
 #include "mmprivate.h"
 
@@ -19,39 +20,30 @@
    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;
 
-
   if (size == 0) {
-    mfree(md, ptr);
-    return (mmalloc(md, 0));
+    mfree(mdp, ptr);
+    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. I will malloc it instead of reallocing it. (please report this bug)\n");
-    result = mmalloc(md, size);
+        ("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(mdp, size);
     abort();
     return result;
   }
 
-  LOCK(mdp);
-  if (mdp->mrealloc_hook != NULL) {
-    UNLOCK(mdp);
-    return ((*mdp->mrealloc_hook) (md, ptr, size));
-  }
-
   block = BLOCK(ptr);
 
   type = mdp->heapinfo[block].busy.type;
@@ -59,51 +51,48 @@ void *mrealloc(void *md, void *ptr, size_t size)
   case 0:
     /* Maybe reallocate a large block to a small fragment.  */
     if (size <= BLOCKSIZE / 2) {
-      UNLOCK(mdp);
       //printf("(%s) alloc large block...",xbt_thread_self_name());
-      result = mmalloc(md, size);
+      result = mmalloc(mdp, size);
       if (result != NULL) {
         memcpy(result, ptr, size);
-        mfree(md, ptr);
+        mfree(mdp, ptr);
         return (result);
       }
     }
 
     /* The new size is a large allocation as well;
        see if we can hold it in place. */
-    LOCK(mdp);
     blocks = BLOCKIFY(size);
-    if (blocks < mdp->heapinfo[block].busy.info.size) {
+    if (blocks < mdp->heapinfo[block].busy.info.block.size) {
       /* 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.size
-          = mdp->heapinfo[block].busy.info.size - blocks;
-      mdp->heapinfo[block].busy.info.size = blocks;
-      mfree(md, ADDRESS(block + blocks));
+      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(mdp, ADDRESS(block + blocks));
       result = ptr;
-    } else if (blocks == mdp->heapinfo[block].busy.info.size) {
+    } else if (blocks == mdp->heapinfo[block].busy.info.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.size;
+      blocks = mdp->heapinfo[block].busy.info.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;
-      UNLOCK(mdp);
-      result = mmalloc(md, size);
+      result = mmalloc(mdp, size);
       if (result == NULL) {
-        mmalloc(md, blocks * BLOCKSIZE);
+        mmalloc(mdp, blocks * BLOCKSIZE);
         return (NULL);
       }
       if (ptr != result)
         memmove(result, ptr, blocks * BLOCKSIZE);
-      LOCK(mdp);
     }
     break;
 
@@ -119,13 +108,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());
 
-      UNLOCK(mdp);
-      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;
   }