From dae3ef10b31c72c8bf8aaa6288883da7d2646070 Mon Sep 17 00:00:00 2001
From: Gabriel Corona <gabriel.corona@loria.fr>
Date: Mon, 24 Feb 2014 10:51:16 +0100
Subject: [PATCH] [mc] Move MC_ignore_local_variable and
 MC_ignore_global_variable to initialisation code

---
 src/mc/mc_compare.c | 5 +----
 src/mc/mc_global.c  | 2 ++
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/mc/mc_compare.c b/src/mc/mc_compare.c
index 3e6fa29a5a..193a90c550 100644
--- a/src/mc/mc_compare.c
+++ b/src/mc/mc_compare.c
@@ -220,7 +220,6 @@ static int compare_global_variables(int region_type, mc_mem_region_t r1, mc_mem_
 
   if(!compared_pointers){
     compared_pointers = xbt_dynar_new(sizeof(pointers_pair_t), pointers_pair_free_voidp);
-    MC_ignore_global_variable("compared_pointers");
   }else{
     xbt_dynar_reset(compared_pointers);
   }
@@ -282,7 +281,6 @@ static int compare_local_variables(mc_snapshot_stack_t stack1, mc_snapshot_stack
 
   if(!compared_pointers){
     compared_pointers = xbt_dynar_new(sizeof(pointers_pair_t), pointers_pair_free_voidp);
-    MC_ignore_global_variable("compared_pointers");
   }else{
     xbt_dynar_reset(compared_pointers);
   }
@@ -620,8 +618,7 @@ int SIMIX_pre_mc_compare_snapshots(smx_simcall_t simcall,
 }
 
 int MC_compare_snapshots(void *s1, void *s2){
-  
-  MC_ignore_local_variable("self", "simcall_BODY_mc_snapshot");
+
   return simcall_mc_compare_snapshots(s1, s2);
 
 }
diff --git a/src/mc/mc_global.c b/src/mc/mc_global.c
index 588ba67183..a17bffc34a 100644
--- a/src/mc/mc_global.c
+++ b/src/mc/mc_global.c
@@ -954,12 +954,14 @@ void MC_init(){
   MC_ignore_local_variable("_throw_ctx", "*");
   MC_ignore_local_variable("ctx", "*");
 
+  MC_ignore_local_variable("self", "simcall_BODY_mc_snapshot");
   MC_ignore_local_variable("next_context", "smx_ctx_sysv_suspend_serial");
   MC_ignore_local_variable("i", "smx_ctx_sysv_suspend_serial");
 
   /* Ignore local variable about time used for tracing */
   MC_ignore_local_variable("start_time", "*"); 
 
+  MC_ignore_global_variable("compared_pointers");
   MC_ignore_global_variable("mc_comp_times");
   MC_ignore_global_variable("mc_snapshot_comparison_time"); 
   MC_ignore_global_variable("mc_time");
-- 
2.20.1