[mc] Move MC-related out of simix and into mc where it belongs

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

diff --git a/src/simix/smx_global.c b/src/simix/smx_global.c
index 36a805e..0404d17 100644 (file)
--- a/src/simix/smx_global.c
+++ b/src/simix/smx_global.c
@@ -5,7 +5,11 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include <stdlib.h>
-#include <sys/ptrace.h>
+#include "src/portable.h"
+#ifdef HAVE_SYS_PTRACE_H
+# include <sys/types.h>
+# include <sys/ptrace.h>
+#endif
 
 #include "smx_private.h"
 #include "xbt/heap.h"
@@ -217,19 +221,7 @@ void SIMIX_global_init(int *argc, char **argv)
 #ifdef HAVE_MC
   // The communication initialization is done ASAP.
   // 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();
-
-      // 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();
-    }
-  }
+  MC_client_init();
 #endif
 
   if (_sg_cfg_exit_asap)