X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3c5b31c9766da42c82473b8c9dbf5910b74f3cb0..6dcccaf23679103bd372210946fbd274751ecac9:/src/mc/simgrid_mc.cpp

diff --git a/src/mc/simgrid_mc.cpp b/src/mc/simgrid_mc.cpp
index 982bd8e73c..397d58aceb 100644
--- a/src/mc/simgrid_mc.cpp
+++ b/src/mc/simgrid_mc.cpp
@@ -4,6 +4,8 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
+#include <exception>
+
 #include <cstdlib>
 #include <cstdio>
 #include <cstring>
@@ -17,6 +19,10 @@
 #include <sys/socket.h>
 #include <sys/wait.h>
 
+#ifdef __linux__
+#include <sys/prctl.h>
+#endif
+
 #include <xbt/log.h>
 
 #include "simgrid/sg_config.h"
@@ -26,15 +32,24 @@
 #include "mc_private.h"
 #include "mc_protocol.h"
 #include "mc_server.h"
-#include "mc_model_checker.h"
+#include "mc_safety.h"
+#include "mc_comm_pattern.h"
+#include "mc_liveness.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_main, mc, "Entry point for simgrid-mc");
 
-static const bool trace = true;
-
 static int do_child(int socket, char** argv)
 {
   XBT_DEBUG("Inside the child process PID=%i", (int) getpid());
+
+#ifdef __linux__
+  // Make sure we do not outlive our parent:
+  if (prctl(PR_SET_PDEATHSIG, SIGHUP) != 0) {
+    std::perror("simgrid-mc");
+    return MC_SERVER_ERROR;
+  }
+#endif
+
   int res;
 
   // Remove CLOEXEC in order to pass the socket to the exec-ed program:
@@ -53,6 +68,11 @@ static int do_child(int socket, char** argv)
   // Set environment:
   setenv(MC_ENV_VARIABLE, "1", 1);
 
+  // Disable lazy relocation in the model-ched process.
+  // We don't want the model-checked process to modify its .got.plt during
+  // snapshot.
+  setenv("LC_BIND_NOW", "1", 1);
+
   char buffer[64];
   res = std::snprintf(buffer, sizeof(buffer), "%i", socket);
   if ((size_t) res >= sizeof(buffer) || res == -1)
@@ -67,11 +87,26 @@ static int do_child(int socket, char** argv)
 static int do_parent(int socket, pid_t child)
 {
   XBT_DEBUG("Inside the parent process");
-  if (MC_server_init(child, socket))
-    return MC_SERVER_ERROR;
-  XBT_DEBUG("Server initialized");
-  MC_server_run();
-  return 0;
+  if (mc_server)
+    xbt_die("MC server already present");
+  try {
+    mc_mode = MC_MODE_SERVER;
+    mc_server = new s_mc_server(child, socket);
+    mc_server->start();
+    MC_init_model_checker(child, socket);
+    if (_sg_mc_comms_determinism || _sg_mc_send_determinism)
+      MC_modelcheck_comm_determinism();
+    else if (!_sg_mc_property_file || _sg_mc_property_file[0] == '\0')
+      MC_modelcheck_safety();
+    else
+      MC_modelcheck_liveness();
+    mc_server->shutdown();
+    mc_server->exit();
+  }
+  catch(std::exception& e) {
+    XBT_ERROR("Exception: %s", e.what());
+  }
+  exit(MC_SERVER_ERROR);
 }
 
 static char** argvdup(int argc, char** argv)
@@ -94,7 +129,7 @@ int main(int argc, char** argv)
   if (argc < 2)
     xbt_die("Missing arguments.\n");
 
-  bool server_mode = false;
+  bool server_mode = true;
   char* env = std::getenv("SIMGRID_MC_MODE");
   if (env) {
     if (std::strcmp(env, "server") == 0)
@@ -102,7 +137,7 @@ int main(int argc, char** argv)
     else if (std::strcmp(env, "standalone") == 0)
       server_mode = false;
     else
-      XBT_WARN("Unrecognised value for SIMGRID_MC_MODE (server/standalone)");
+      xbt_die("Unrecognised value for SIMGRID_MC_MODE (server/standalone)");
   }
 
   if (!server_mode) {