model-checker : comment backtrace and add ignore mechanism in mmalloc metadata

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

diff --git a/src/xbt/mmalloc/mfree.c b/src/xbt/mmalloc/mfree.c
index f10f48b..e9031eb 100644 (file)
--- a/src/xbt/mmalloc/mfree.c
+++ b/src/xbt/mmalloc/mfree.c
@@ -22,9 +22,11 @@ void mfree(struct mdesc *mdp, void *ptr)
   int type;
   size_t block, frag_nb;
   register size_t i;
   int type;
   size_t block, frag_nb;
   register size_t i;

-  struct list *prev, *next;

   int it;
 
   int it;
 

+  mmalloc_paranoia(mdp);
+//  fprintf(stderr,"free(%p)\n",ptr);
+

   if (ptr == NULL)
     return;
 
   if (ptr == NULL)
     return;
 


@@ -35,7 +37,6 @@ void mfree(struct mdesc *mdp, void *ptr)
     abort();
   }
 
     abort();
   }
 

-

   type = mdp->heapinfo[block].type;
 
   switch (type) {
   type = mdp->heapinfo[block].type;
 
   switch (type) {


@@ -147,11 +148,6 @@ void mfree(struct mdesc *mdp, void *ptr)
     mdp -> heapstats.chunks_free++;
     mdp -> heapstats.bytes_free += 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) +
-       (mdp->heapinfo[block].busy_frag.first << type));
-

     frag_nb = RESIDUAL(ptr, BLOCKSIZE) >> type;
 
     if( mdp->heapinfo[block].busy_frag.frag_size[frag_nb] == -1){
     frag_nb = RESIDUAL(ptr, BLOCKSIZE) >> type;
 
     if( mdp->heapinfo[block].busy_frag.frag_size[frag_nb] == -1){


@@ -161,24 +157,20 @@ void mfree(struct mdesc *mdp, void *ptr)
 
     /* Set size used in the fragment to -1 */
     mdp->heapinfo[block].busy_frag.frag_size[frag_nb] = -1;
 
     /* Set size used in the fragment to -1 */
     mdp->heapinfo[block].busy_frag.frag_size[frag_nb] = -1;

-
+    mdp->heapinfo[block].busy_frag.ignore[frag_nb] = 0;
+    
+//    fprintf(stderr,"nfree:%zu capa:%d\n", mdp->heapinfo[block].busy_frag.nfree,(BLOCKSIZE >> type));

     if (mdp->heapinfo[block].busy_frag.nfree ==
         (BLOCKSIZE >> type) - 1) {
     if (mdp->heapinfo[block].busy_frag.nfree ==
         (BLOCKSIZE >> type) - 1) {

-      /* If all fragments of this block are free, remove them
-         from the fragment list and free the whole block.  */
-      next = prev;
-      for (i = 1; i < (size_t) (BLOCKSIZE >> type); ++i) {
-        next = next->next;
-      }
-      prev->prev->next = next;
-      if (next != NULL) {
-        next->prev = prev->prev;
-      }
+      /* If all fragments of this block are free, remove this block from its swag and free the whole block.  */
+      xbt_swag_remove(&mdp->heapinfo[block],&mdp->fraghead[type]);
+

       /* pretend that this block is used and free it so that it gets properly coalesced with adjacent free blocks */
       mdp->heapinfo[block].type = 0;
       mdp->heapinfo[block].busy_block.size = 1;
       mdp->heapinfo[block].busy_block.busy_size = 0;
       /* pretend that this block is used and free it so that it gets properly coalesced with adjacent free blocks */
       mdp->heapinfo[block].type = 0;
       mdp->heapinfo[block].busy_block.size = 1;
       mdp->heapinfo[block].busy_block.busy_size = 0;

-      
+      mdp->heapinfo[block].busy_block.ignore = 0;
+            

       /* Keep the statistics accurate.  */
       mdp -> heapstats.chunks_used++;
       mdp -> heapstats.bytes_used += BLOCKSIZE;
       /* Keep the statistics accurate.  */
       mdp -> heapstats.chunks_used++;
       mdp -> heapstats.bytes_used += BLOCKSIZE;


@@ -187,31 +179,19 @@ void mfree(struct mdesc *mdp, void *ptr)
       
       mfree((void *) mdp, (void *) ADDRESS(block));
     } else if (mdp->heapinfo[block].busy_frag.nfree != 0) {
       
       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
-         fragment into the fragment list after the first free
-         fragment of this block. */
-      next = (struct list *) ptr;
-      next->next = prev->next;
-      next->prev = prev;
-      prev->next = next;
-      if (next->next != NULL) {
-        next->next->prev = next;
-      }
+      /* If some fragments of this block are free, you know what? I'm already happy. */

       ++mdp->heapinfo[block].busy_frag.nfree;
     } else {
       /* No fragments of this block were free before the one we just released,
       ++mdp->heapinfo[block].busy_frag.nfree;
     } else {
       /* No fragments of this block were free before the one we just released,

-       * so link this fragment into the fragment list and announce that
+       * so add this block to the swag and announce that

        it is the first free fragment of this block. */
        it is the first free fragment of this block. */

-      prev = (struct list *) ptr;

       mdp->heapinfo[block].busy_frag.nfree = 1;
       mdp->heapinfo[block].busy_frag.nfree = 1;

-      mdp->heapinfo[block].busy_frag.first = frag_nb;
-      prev->next = mdp->fraghead[type].next;
-      prev->prev = &mdp->fraghead[type];
-      prev->prev->next = prev;
-      if (prev->next != NULL) {
-        prev->next->prev = prev;
-      }
+      mdp->heapinfo[block].freehook.prev = NULL;
+      mdp->heapinfo[block].freehook.next = NULL;
+
+      xbt_swag_insert(&mdp->heapinfo[block],&mdp->fraghead[type]);

     }
     break;
   }
 }
     }
     break;
   }
 }

+