From: Gabriel Corona <gabriel.corona@loria.fr>
Date: Fri, 27 Jun 2014 08:20:15 +0000 (+0200)
Subject: Merge branch 'mc-fastsnapshot' into mc
X-Git-Tag: v3_12~956^2~1
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/251bbe5068a2a7b23a23a4df11fc1b785dce6ff4

Merge branch 'mc-fastsnapshot' into mc

Conflicts:
	src/mc/mc_visited.c
---

251bbe5068a2a7b23a23a4df11fc1b785dce6ff4
diff --cc src/mc/mc_global.c
index fe8508bb6b,1359cf3c3d..524056e540
--- a/src/mc/mc_global.c
+++ b/src/mc/mc_global.c
@@@ -278,10 -302,11 +304,14 @@@ void MC_init(
      MC_ignore_global_variable("maestro_stack_start");
      MC_ignore_global_variable("maestro_stack_end");
      MC_ignore_global_variable("smx_total_comms");
 +    MC_ignore_global_variable("communications_pattern");
 +    MC_ignore_global_variable("initial_communications_pattern");
 +    MC_ignore_global_variable("incomplete_communications_pattern");
  
+     if (MC_is_active()) {
+       MC_ignore_global_variable("mc_diff_info");
+     }
+ 
      MC_ignore_heap(mc_time, simix_process_maxpid * sizeof(double));
  
      smx_process_t process;