[mc] Fix unitialized variable

[simgrid.git] / src / mc / mcer_ignore.cpp

diff --git a/src/mc/mcer_ignore.cpp b/src/mc/mcer_ignore.cpp
index 08cb7b0..54d2da2 100644 (file)
--- a/src/mc/mcer_ignore.cpp
+++ b/src/mc/mcer_ignore.cpp
@@ -112,7 +112,6 @@ void MC_heap_region_ignore_remove(void *address, size_t size)
 void MCer_ignore_global_variable(const char *name)
 {
   mc_process_t process = &mc_model_checker->process();
-  xbt_mheap_t heap = mmalloc_set_current_heap(mc_heap);
   xbt_assert(process->object_infos, "MC subsystem not initialized");
 
   size_t n = process->object_infos_size;
@@ -138,7 +137,6 @@ void MCer_ignore_global_variable(const char *name)
       }
     }
   }
-  mmalloc_set_current_heap(heap);
 }
 
 // ***** Ignore local variables
@@ -156,15 +154,12 @@ void MC_ignore_local_variable(const char *var_name, const char *frame_name)
   mc_process_t process = &mc_model_checker->process();
   if (strcmp(frame_name, "*") == 0)
     frame_name = NULL;
-  xbt_mheap_t heap = mmalloc_set_current_heap(mc_heap);
 
   size_t n = process->object_infos_size;
   size_t i;
   for (i=0; i!=n; ++i) {
     MC_ignore_local_variable_in_object(var_name, frame_name, process->object_infos[i]);
   }
-
-  mmalloc_set_current_heap(heap);
 }
 
 static void MC_ignore_local_variable_in_object(const char *var_name,
@@ -243,4 +238,86 @@ static void mc_ignore_local_variable_in_scope(const char *var_name,
   }
 }
 
+// ****** Checkpoint ignore:
+
+static void checkpoint_ignore_region_free(mc_checkpoint_ignore_region_t r)
+{
+  xbt_free(r);
+}
+
+static void checkpoint_ignore_region_free_voidp(void *r)
+{
+  checkpoint_ignore_region_free((mc_checkpoint_ignore_region_t) * (void **) r);
+}
+
+xbt_dynar_t MC_checkpoint_ignore_new(void)
+{
+  return xbt_dynar_new(sizeof(mc_checkpoint_ignore_region_t),
+                        checkpoint_ignore_region_free_voidp);
+}
+
+// ***** Generic memory ignore mechanism
+
+void MC_process_ignore_memory(mc_process_t process, void *addr, size_t size)
+{
+  xbt_dynar_t checkpoint_ignore = process->checkpoint_ignore;
+  mc_checkpoint_ignore_region_t region =
+      xbt_new0(s_mc_checkpoint_ignore_region_t, 1);
+  region->addr = addr;
+  region->size = size;
+
+  if (xbt_dynar_is_empty(checkpoint_ignore)) {
+    xbt_dynar_push(checkpoint_ignore, &region);
+  } else {
+
+    unsigned int cursor = 0;
+    int start = 0;
+    int end = xbt_dynar_length(checkpoint_ignore) - 1;
+    mc_checkpoint_ignore_region_t current_region = NULL;
+
+    while (start <= end) {
+      cursor = (start + end) / 2;
+      current_region =
+          (mc_checkpoint_ignore_region_t) xbt_dynar_get_as(checkpoint_ignore,
+                                                           cursor,
+                                                           mc_checkpoint_ignore_region_t);
+      if (current_region->addr == addr) {
+        if (current_region->size == size) {
+          checkpoint_ignore_region_free(region);
+          return;
+        } else if (current_region->size < size) {
+          start = cursor + 1;
+        } else {
+          end = cursor - 1;
+        }
+      } else if (current_region->addr < addr) {
+        start = cursor + 1;
+      } else {
+        end = cursor - 1;
+      }
+    }
+
+    if (current_region->addr == addr) {
+      if (current_region->size < size) {
+        xbt_dynar_insert_at(checkpoint_ignore, cursor + 1, &region);
+      } else {
+        xbt_dynar_insert_at(checkpoint_ignore, cursor, &region);
+      }
+    } else if (current_region->addr < addr) {
+      xbt_dynar_insert_at(checkpoint_ignore, cursor + 1, &region);
+    } else {
+      xbt_dynar_insert_at(checkpoint_ignore, cursor, &region);
+    }
+  }
+}
+
+extern xbt_dynar_t stacks_areas;
+
+void MC_stack_area_add(stack_region_t stack_area)
+{
+  if (stacks_areas == NULL)
+    stacks_areas = xbt_dynar_new(sizeof(stack_region_t), NULL);
+  xbt_dynar_push(stacks_areas, &stack_area);
+}
+
 }