[mc] Add some FIXMEs for cross-process support

[simgrid.git] / src / mc / mc_ignore.c

diff --git a/src/mc/mc_ignore.c b/src/mc/mc_ignore.c
index 0675eb9..e16383a 100644 (file)
--- a/src/mc/mc_ignore.c
+++ b/src/mc/mc_ignore.c
@@ -61,8 +61,11 @@ static void checkpoint_ignore_region_free_voidp(void *r)
 
 /***********************************************************************/
 
+// FIXME, cross-process support? (or make this it is used on the app-side)
 void MC_ignore_heap(void *address, size_t size)
 {
+  if(!std_heap)
+    return;
 
   int raw_mem_set = (mmalloc_get_current_heap() == mc_heap);
 
@@ -173,6 +176,7 @@ void MC_remove_ignore_heap(void *address, size_t size)
 
 }
 
+// FIXME, cross-process support?
 void MC_ignore_global_variable(const char *name)
 {
   mc_process_t process = &mc_model_checker->process;
@@ -221,6 +225,7 @@ void MC_ignore_global_variable(const char *name)
  *  \param subprogram      (possibly inlined) Subprogram of the scope
  *  \param scope           Current scope
  */
+ // FIXME, cross-process support (messaging?)
 static void mc_ignore_local_variable_in_scope(const char *var_name,
                                               const char *subprogram_name,
                                               dw_frame_t subprogram,
@@ -228,7 +233,7 @@ static void mc_ignore_local_variable_in_scope(const char *var_name,
 {
   // Processing of direct variables:
 
-  // If the current subprogram matche the given name:
+  // If the current subprogram matches the given name:
   if (!subprogram_name ||
       (subprogram->name && strcmp(subprogram_name, subprogram->name) == 0)) {
 
@@ -298,9 +303,11 @@ void MC_ignore_local_variable(const char *var_name, const char *frame_name)
 
   MC_SET_MC_HEAP;
 
-  MC_ignore_local_variable_in_object(var_name, frame_name, process->libsimgrid_info);
-  if (frame_name != NULL)
-    MC_ignore_local_variable_in_object(var_name, frame_name, process->binary_info);
+  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]);
+  }
 
   if (!raw_mem_set)
     MC_SET_STD_HEAP;
@@ -310,7 +317,7 @@ void MC_ignore_local_variable(const char *var_name, const char *frame_name)
 /** @brief Register a stack in the model checker
  *
  *  The stacks are allocated in the heap. The MC handle them especially
- *  when we analyse/compare the content of theap so it must be told where
+ *  when we analyse/compare the content of the heap so it must be told where
  *  they are with this function.
  *
  *  @param stack
@@ -357,6 +364,7 @@ void MC_ignore(void *addr, size_t size)
 
   MC_SET_MC_HEAP;
 
+  // FIXME, cross-process support
   if (mc_checkpoint_ignore == NULL)
     mc_checkpoint_ignore =
         xbt_dynar_new(sizeof(mc_checkpoint_ignore_region_t),