kill an unused/undocumented/un-understood function

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

diff --git a/src/xbt/mmalloc/mmalloc.c b/src/xbt/mmalloc/mmalloc.c
index fe893b0..a5a0192 100644 (file)
--- a/src/xbt/mmalloc/mmalloc.c
+++ b/src/xbt/mmalloc/mmalloc.c
@@ -27,11 +27,11 @@ static void *align(struct mdesc *mdp, size_t size)
   void *result;
   unsigned long int adj;
 
-  result = mdp->morecore(mdp, size);
+  result = mmorecore(mdp, size);
   adj = RESIDUAL(result, BLOCKSIZE);
   if (adj != 0) {
     adj = BLOCKSIZE - adj;
-    mdp->morecore(mdp, adj);
+    mmorecore(mdp, adj);
     result = (char *) result + adj;
   }
   return (result);
@@ -78,7 +78,7 @@ static void *morecore(struct mdesc *mdp, size_t size)
     }
     newinfo = (malloc_info *) align(mdp, newsize * sizeof(malloc_info));
     if (newinfo == NULL) {
-      mdp->morecore(mdp, -size);
+      mmorecore(mdp, -size);
       return (NULL);
     }
     memset((void *) newinfo, 0, newsize * sizeof(malloc_info));
@@ -100,9 +100,8 @@ static void *morecore(struct mdesc *mdp, size_t size)
 
 /* Allocate memory from the heap.  */
 
-void *mmalloc(void *md, size_t size)
+void *mmalloc(xbt_mheap_t mdp, size_t size)
 {
-  struct mdesc *mdp;
   void *result;
   size_t block, blocks, lastblocks, start;
   register size_t i;
@@ -115,7 +114,6 @@ void *mmalloc(void *md, size_t size)
   if (size == 0)
     size = 1;
 
-  mdp = MD_TO_MDP(md);
 //  printf("(%s) Mallocing %d bytes on %p (default: %p)...",xbt_thread_self_name(),size,mdp,__mmalloc_default_mdp);fflush(stdout);
 
   if (!(mdp->flags & MMALLOC_INITIALIZED)) {
@@ -156,16 +154,11 @@ void *mmalloc(void *md, size_t size)
             RESIDUAL(next->next, BLOCKSIZE) >> log;
       }
 
-      /* Update the statistics.  */
-      mdp->heapstats.chunks_used++;
-      mdp->heapstats.bytes_used += 1 << log;
-      mdp->heapstats.chunks_free--;
-      mdp->heapstats.bytes_free -= 1 << log;
     } else {
       /* No free fragments of the desired size, so get a new block
          and break it into fragments, returning the first.  */
       //printf("(%s) No free fragment...",xbt_thread_self_name());
-      result = mmalloc(md, BLOCKSIZE);
+      result = mmalloc(mdp, BLOCKSIZE);
       //printf("(%s) Fragment: %p...",xbt_thread_self_name(),result);
       if (result == NULL) {
         return (NULL);
@@ -187,10 +180,6 @@ void *mmalloc(void *md, size_t size)
       mdp->heapinfo[block].busy.type = log;
       mdp->heapinfo[block].busy.info.frag.nfree = i - 1;
       mdp->heapinfo[block].busy.info.frag.first = i - 1;
-
-      mdp->heapstats.chunks_free += (BLOCKSIZE >> log) - 1;
-      mdp->heapstats.bytes_free += BLOCKSIZE - (1 << log);
-      mdp->heapstats.bytes_used -= BLOCKSIZE - (1 << log);
     }
   } else {
     /* Large allocation to receive one or more blocks.
@@ -209,7 +198,7 @@ void *mmalloc(void *md, size_t size)
         lastblocks = mdp->heapinfo[block].free.size;
         if (mdp->heaplimit != 0 &&
             block + lastblocks == mdp->heaplimit &&
-            mdp->morecore(mdp, 0) == ADDRESS(block + lastblocks) &&
+            mmorecore(mdp, 0) == ADDRESS(block + lastblocks) &&
             (morecore(mdp, (blocks - lastblocks) * BLOCKSIZE)) != NULL) {
           /* Which block we are extending (the `final free
              block' referred to above) might have changed, if
@@ -217,7 +206,6 @@ void *mmalloc(void *md, size_t size)
           block = mdp->heapinfo[0].free.prev;
 
           mdp->heapinfo[block].free.size += (blocks - lastblocks);
-          mdp->heapstats.bytes_free += (blocks - lastblocks) * BLOCKSIZE;
           continue;
         }
         result = morecore(mdp, blocks * BLOCKSIZE);
@@ -228,8 +216,6 @@ void *mmalloc(void *md, size_t size)
         mdp->heapinfo[block].busy.type = 0;
         mdp->heapinfo[block].busy.info.block.size = blocks;
        mdp->heapinfo[block].busy.info.block.busy_size = size;
-        mdp->heapstats.chunks_used++;
-        mdp->heapstats.bytes_used += blocks * BLOCKSIZE;
         return (result);
       }
     }
@@ -256,15 +242,11 @@ void *mmalloc(void *md, size_t size)
           = mdp->heapinfo[block].free.prev;
       mdp->heapinfo[mdp->heapinfo[block].free.prev].free.next
           = mdp->heapindex = mdp->heapinfo[block].free.next;
-      mdp->heapstats.chunks_free--;
     }
 
     mdp->heapinfo[block].busy.type = 0;
     mdp->heapinfo[block].busy.info.block.size = blocks;
     mdp->heapinfo[block].busy.info.block.busy_size = size;
-    mdp->heapstats.chunks_used++;
-    mdp->heapstats.bytes_used += blocks * BLOCKSIZE;
-    mdp->heapstats.bytes_free -= blocks * BLOCKSIZE;
   }
   //printf("(%s) Done mallocing. Result is %p\n",xbt_thread_self_name(),result);fflush(stdout);
   return (result);