Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

[simgrid.git] / src / simix / smx_process.c

diff --git a/src/simix/smx_process.c b/src/simix/smx_process.c
index 6a3ca37..ad38a71 100644 (file)
--- a/src/simix/smx_process.c
+++ b/src/simix/smx_process.c
@@ -710,8 +710,12 @@ void SIMIX_process_yield(smx_process_t self)
     SMX_THROW();
   }
 
-  if(MC_is_active())
+  /* Ignore some local variables from xbt/ex.c for stacks comparison */
+  if(MC_is_active()){
     MC_ignore_stack("ctx", "SIMIX_process_yield");
+    MC_ignore_stack("_throw_ctx", "SIMIX_process_yield");
+    MC_ignore_stack("_log_ev", "SIMIX_process_yield");
+  }
 }
 
 /* callback: context fetching */