sed -i -e 's/\t/ /g' *.[ch] Please people, stop using tabs in your source

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

diff --git a/src/xbt/mmalloc/mfree.c b/src/xbt/mmalloc/mfree.c
index 5d54412..de6aa5c 100644 (file)
--- a/src/xbt/mmalloc/mfree.c
+++ b/src/xbt/mmalloc/mfree.c
@@ -25,7 +25,7 @@ void mfree(struct mdesc *mdp, void *ptr)
   int it;
 
   if (ptr == NULL)
-         return;
+    return;
 
   block = BLOCK(ptr);
 
@@ -44,6 +44,13 @@ void mfree(struct mdesc *mdp, void *ptr)
     break;
 
   case 0:
+     /* Get as many statistics as early as we can.  */
+      mdp -> heapstats.chunks_used--;
+      mdp -> heapstats.bytes_used -=
+    mdp -> heapinfo[block].busy_block.size * BLOCKSIZE;
+      mdp -> heapstats.bytes_free +=
+    mdp -> heapinfo[block].busy_block.size * BLOCKSIZE;
+
     /* Find the free cluster previous to this one in the free list.
        Start searching at the last block referenced; this may benefit
        programs with locality of allocation.  */
@@ -67,12 +74,12 @@ void mfree(struct mdesc *mdp, void *ptr)
       mdp->heapinfo[i].free_block.size += mdp->heapinfo[block].busy_block.size;
       /* Mark all my ex-blocks as free */
       for (it=0; it<mdp->heapinfo[block].busy_block.size; it++) {
-         if (mdp->heapinfo[block+it].type <0) {
-               fprintf(stderr,"Internal Error: Asked to free a block already marked as free (block=%lu it=%d type=%lu). Please report this bug.\n",
-                               (unsigned long)block,it,(unsigned long)mdp->heapinfo[block].type);
-               abort();
-         }
-         mdp->heapinfo[block+it].type = -1;
+        if (mdp->heapinfo[block+it].type <0) {
+          fprintf(stderr,"Internal Error: Asked to free a block already marked as free (block=%lu it=%d type=%lu). Please report this bug.\n",
+              (unsigned long)block,it,(unsigned long)mdp->heapinfo[block].type);
+          abort();
+        }
+        mdp->heapinfo[block+it].type = -1;
       }
 
       block = i;
@@ -84,14 +91,15 @@ void mfree(struct mdesc *mdp, void *ptr)
       mdp->heapinfo[block].free_block.prev = i;
       mdp->heapinfo[i].free_block.next = block;
       mdp->heapinfo[mdp->heapinfo[block].free_block.next].free_block.prev = block;
+      mdp -> heapstats.chunks_free++;
       /* Mark all my ex-blocks as free */
       for (it=0; it<mdp->heapinfo[block].free_block.size; it++) {
-         if (mdp->heapinfo[block+it].type <0) {
-               fprintf(stderr,"Internal error: Asked to free a block already marked as free (block=%lu it=%d/%lu type=%lu). Please report this bug.\n",
-                               (unsigned long)block,it,(unsigned long)mdp->heapinfo[block].free_block.size,(unsigned long)mdp->heapinfo[block].type);
-               abort();
-         }
-         mdp->heapinfo[block+it].type = -1;
+        if (mdp->heapinfo[block+it].type <0) {
+          fprintf(stderr,"Internal error: Asked to free a block already marked as free (block=%lu it=%d/%lu type=%lu). Please report this bug.\n",
+              (unsigned long)block,it,(unsigned long)mdp->heapinfo[block].free_block.size,(unsigned long)mdp->heapinfo[block].type);
+          abort();
+        }
+        mdp->heapinfo[block+it].type = -1;
       }
     }
 
@@ -105,6 +113,7 @@ void mfree(struct mdesc *mdp, void *ptr)
       mdp->heapinfo[block].free_block.next
           = mdp->heapinfo[mdp->heapinfo[block].free_block.next].free_block.next;
       mdp->heapinfo[mdp->heapinfo[block].free_block.next].free_block.prev = block;
+      mdp -> heapstats.chunks_free--;
     }
 
     /* Now see if we can return stuff to the system.  */
@@ -129,6 +138,13 @@ void mfree(struct mdesc *mdp, void *ptr)
     break;
 
   default:
+    /* Do some of the statistics.  */
+      mdp -> heapstats.chunks_used--;
+      mdp -> heapstats.bytes_used -= 1 << type;
+      mdp -> heapstats.chunks_free++;
+      mdp -> heapstats.bytes_free += 1 << type;
+
+    
     /* Get the address of the first free fragment in this block.  */
     prev = (struct list *)
         ((char *) ADDRESS(block) +
@@ -150,7 +166,13 @@ void mfree(struct mdesc *mdp, void *ptr)
       mdp->heapinfo[block].type = 0;
       mdp->heapinfo[block].busy_block.size = 1;
       mdp->heapinfo[block].busy_block.busy_size = 0;
-
+      
+      /* Keep the statistics accurate.  */
+      mdp -> heapstats.chunks_used++;
+      mdp -> heapstats.bytes_used += BLOCKSIZE;
+      mdp -> heapstats.chunks_free -= BLOCKSIZE >> type;
+      mdp -> heapstats.bytes_free -= BLOCKSIZE;
+      
       mfree((void *) mdp, (void *) ADDRESS(block));
     } else if (mdp->heapinfo[block].busy_frag.nfree != 0) {
       /* If some fragments of this block are free, link this