X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fa222c38f9b796be07ab4351ffc810a61a8fd705..4f0921c868b916da79370ef6ba03d368be06a6e3:/src/simix/smx_global.c?ds=sidebyside

diff --git a/src/simix/smx_global.c b/src/simix/smx_global.c
index d78fe0e6be..3b92c94667 100644
--- a/src/simix/smx_global.c
+++ b/src/simix/smx_global.c
@@ -5,6 +5,7 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include <stdlib.h>
+#include <sys/ptrace.h>
 
 #include "smx_private.h"
 #include "xbt/heap.h"
@@ -13,18 +14,24 @@
 #include "xbt/str.h"
 #include "xbt/ex.h"             /* ex_backtrace_display */
 #include "mc/mc.h"
-#include "mc/mc_replay.h"
+#include "src/mc/mc_replay.h"
 #include "simgrid/sg_config.h"
 
 #ifdef HAVE_MC
-#include "mc/mc_private.h"
-#include "mc/mc_protocol.h"
-#include "mc/mc_client.h"
+#include "src/mc/mc_private.h"
+#include "src/mc/mc_protocol.h"
+#include "src/mc/mc_client.h"
 #endif
-#include "mc/mc_record.h"
+
+#ifdef HAVE_MC
+#include <stdlib.h>
+#include "src/mc/mc_protocol.h"
+#endif 
+
+#include "src/mc/mc_record.h"
 
 #ifdef HAVE_SMPI
-#include "smpi/private.h"
+#include "src/smpi/private.h"
 #endif
 
 XBT_LOG_NEW_CATEGORY(simix, "All SIMIX categories");
@@ -151,6 +158,10 @@ XBT_INLINE double SIMIX_timer_next(void)
  */
 void SIMIX_global_init(int *argc, char **argv)
 {
+#ifdef HAVE_MC
+  _sg_do_model_check = getenv(MC_ENV_VARIABLE) != NULL;
+#endif
+
   s_smx_process_t proc;
 
   if (!simix_global) {
@@ -216,9 +227,14 @@ void SIMIX_global_init(int *argc, char **argv)
   // We need to communicate  initialization of the different layers to the model-checker.
   if (mc_mode == MC_MODE_NONE) {
     if (getenv(MC_ENV_SOCKET_FD)) {
+
       mc_mode = MC_MODE_CLIENT;
       MC_client_init();
-      MC_client_hello();
+
+      // Waiting for the model-checker:
+      if (ptrace(PTRACE_TRACEME, 0, NULL, NULL) == -1 || raise(SIGSTOP) != 0)
+        xbt_die("Could not wait for the model-checker");
+
       MC_client_handle_messages();
     }
   }
@@ -228,6 +244,7 @@ void SIMIX_global_init(int *argc, char **argv)
     exit(0);
 }
 
+int smx_cleaned = 0;
 /**
  * \ingroup SIMIX_API
  * \brief Clean the SIMIX simulation
@@ -236,12 +253,11 @@ void SIMIX_global_init(int *argc, char **argv)
  */
 void SIMIX_clean(void)
 {
-  static int cleaned = 0;
 #ifdef TIME_BENCH_PER_SR
   smx_ctx_raw_new_sr();
 #endif
-  if (cleaned) return; // to avoid double cleaning by java and C
-  cleaned = 1;
+  if (smx_cleaned) return; // to avoid double cleaning by java and C
+  smx_cleaned = 1;
   XBT_DEBUG("SIMIX_clean called. Simulation's over.");
   if (!xbt_dynar_is_empty(simix_global->process_to_run) && SIMIX_get_clock() == 0.0) {
 	  XBT_CRITICAL("   ");