From f703e5eea34c57dbfcda1f9c6d2e8ac3f1512062 Mon Sep 17 00:00:00 2001
From: Marion Guthmuller <marion.guthmuller@loria.fr>
Date: Fri, 25 Jan 2013 13:05:25 +0100
Subject: [PATCH 1/1] model-checker : need to switch between raw heap and std
 heap to remove ignore region

---
 include/xbt/mmalloc.h       |  4 ----
 src/include/mc/mc.h         |  1 +
 src/mc/mc_global.c          | 42 +++++++++++++++++++++++++++++++++++++
 src/xbt/mmalloc/mfree.c     | 13 +++++++-----
 src/xbt/mmalloc/mm_module.c | 33 -----------------------------
 5 files changed, 51 insertions(+), 42 deletions(-)

diff --git a/include/xbt/mmalloc.h b/include/xbt/mmalloc.h
index 038b5d32dc..c259bf6d2e 100644
--- a/include/xbt/mmalloc.h
+++ b/include/xbt/mmalloc.h
@@ -75,8 +75,4 @@ int is_free_area(void *area, xbt_mheap_t heap);
 
 size_t mmalloc_get_chunks_used(xbt_mheap_t);
 
-void remove_ignore_heap(void *address, size_t size);
-
-
-
 #endif                          /* MMALLOC_H */
diff --git a/src/include/mc/mc.h b/src/include/mc/mc.h
index 7b3cb1d67e..4680251d1e 100644
--- a/src/include/mc/mc.h
+++ b/src/include/mc/mc.h
@@ -54,6 +54,7 @@ void MC_automaton_load(const char *file);
 
 /****************************** MC ignore **********************************/
 XBT_PUBLIC(void) MC_ignore_heap(void *address, size_t size);
+XBT_PUBLIC(void) MC_remove_ignore_heap(void *address, size_t size);
 XBT_PUBLIC(void) MC_ignore_stack(const char *var_name, const char *frame);
 XBT_PUBLIC(void) MC_ignore_data_bss(void *address, size_t size);
 void MC_new_stack_area(void *stack, char *name, void *context, size_t size);
diff --git a/src/mc/mc_global.c b/src/mc/mc_global.c
index 97e31b9631..461e0b53a9 100644
--- a/src/mc/mc_global.c
+++ b/src/mc/mc_global.c
@@ -794,6 +794,48 @@ void MC_ignore_heap(void *address, size_t size){
     MC_SET_RAW_MEM;
 }
 
+void MC_remove_ignore_heap(void *address, size_t size){
+
+  int raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
+
+  MC_SET_RAW_MEM;
+  
+  unsigned int cursor = 0;
+  int start = 0;
+  int end = xbt_dynar_length(mc_heap_comparison_ignore) - 1;
+  mc_heap_ignore_region_t region;
+  int ignore_found = 0;
+
+  while(start <= end){
+    cursor = (start + end) / 2;
+    region = (mc_heap_ignore_region_t)xbt_dynar_get_as(mc_heap_comparison_ignore, cursor, mc_heap_ignore_region_t);
+    if(region->address == address){
+      ignore_found = 1;
+      break;
+    }
+    if(region->address < address)
+      start = cursor + 1;
+    if(region->address > address){
+      if((char * )region->address <= ((char *)address + size)){
+        ignore_found = 1;
+        break;
+      }else
+        end = cursor - 1;   
+    }
+  }
+  
+  if(ignore_found == 1){
+    xbt_dynar_remove_at(mc_heap_comparison_ignore, cursor, NULL);
+    MC_remove_ignore_heap(address, size);
+  }
+
+  MC_UNSET_RAW_MEM;
+  
+  if(raw_mem_set)
+    MC_SET_RAW_MEM;
+
+}
+
 void MC_ignore_data_bss(void *address, size_t size){
 
   int raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
diff --git a/src/xbt/mmalloc/mfree.c b/src/xbt/mmalloc/mfree.c
index cd0fd33ccb..d380809c3f 100644
--- a/src/xbt/mmalloc/mfree.c
+++ b/src/xbt/mmalloc/mfree.c
@@ -54,8 +54,10 @@ void mfree(struct mdesc *mdp, void *ptr)
     mdp -> heapstats.bytes_free +=
       mdp -> heapinfo[block].busy_block.size * BLOCKSIZE;
 
-    if(mdp->heapinfo[block].busy_block.ignore == 1)
-      remove_ignore_heap(ptr, mdp -> heapinfo[block].busy_block.busy_size);
+    if(MC_is_active()){
+      if(mdp->heapinfo[block].busy_block.ignore == 1)
+        MC_remove_ignore_heap(ptr, mdp -> heapinfo[block].busy_block.busy_size);
+    }
 
     /* Find the free cluster previous to this one in the free list.
        Start searching at the last block referenced; this may benefit
@@ -162,9 +164,10 @@ void mfree(struct mdesc *mdp, void *ptr)
       THROWF(system_error, 0, "Asked to free a fragment that is already free. I'm puzzled\n");
     }
 
-    if(mdp->heapinfo[block].busy_frag.ignore[frag_nb] == 1)
-      remove_ignore_heap(ptr, mdp->heapinfo[block].busy_frag.frag_size[frag_nb]);
-
+    if(MC_is_active()){
+      if(mdp->heapinfo[block].busy_frag.ignore[frag_nb] == 1)
+        MC_remove_ignore_heap(ptr, mdp->heapinfo[block].busy_frag.frag_size[frag_nb]);
+    }
     /* 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;
diff --git a/src/xbt/mmalloc/mm_module.c b/src/xbt/mmalloc/mm_module.c
index b31daac7be..07cbe7ef7e 100644
--- a/src/xbt/mmalloc/mm_module.c
+++ b/src/xbt/mmalloc/mm_module.c
@@ -347,36 +347,3 @@ void mmalloc_postexit(void)
 size_t mmalloc_get_chunks_used(xbt_mheap_t heap){
   return ((struct mdesc *)heap)->heapstats.chunks_used;
 }
-
-void remove_ignore_heap(void *address, size_t size){
-  
-  unsigned int cursor = 0;
-  int start = 0;
-  int end = xbt_dynar_length(mc_heap_comparison_ignore) - 1;
-  mc_heap_ignore_region_t region;
-  int ignore_found = 0;
-
-  while(start <= end){
-    cursor = (start + end) / 2;
-    region = (mc_heap_ignore_region_t)xbt_dynar_get_as(mc_heap_comparison_ignore, cursor, mc_heap_ignore_region_t);
-    if(region->address == address){
-      ignore_found = 1;
-      break;
-    }
-    if(region->address < address)
-      start = cursor + 1;
-    if(region->address > address){
-      if((char * )region->address <= ((char *)address + size)){
-        ignore_found = 1;
-        break;
-      }else
-        end = cursor - 1;   
-    }
-  }
-  
-  if(ignore_found == 1){
-    xbt_dynar_remove_at(mc_heap_comparison_ignore, cursor, NULL);
-    remove_ignore_heap(address, size);
-  }
-
-}
-- 
2.30.2