[mc] Remove MC code in sigsegvhandler

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

diff --git a/src/simix/smx_global.c b/src/simix/smx_global.c
index d3337a3..aae71fa 100644 (file)
--- 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,24 +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
 
 #ifdef HAVE_MC
 #include <stdlib.h>
-#include "mc/mc_protocol.h"
+#include "src/mc/mc_protocol.h"
 #endif 
 
-#include "mc/mc_record.h"
+#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");
@@ -87,14 +88,6 @@ static void _XBT_CALL segvhandler(int signum, siginfo_t *siginfo, void *context)
     }
 #endif
   }
-#ifdef HAVE_MC
-  if (MC_is_active()) {
-    if (mc_stack) {
-      MC_dump_stack_safety(mc_stack);
-    }
-    MC_print_statistics(mc_stats);
-  }
-#endif
   raise(signum);
 }
 
@@ -226,9 +219,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();
     }
   }