X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d97d6e19cb366fd112e63d56a9f411d968ee8670..d098dd9e12ee321b061421f535b2b56ce7691673:/src/mc/simgrid_mc.cpp

diff --git a/src/mc/simgrid_mc.cpp b/src/mc/simgrid_mc.cpp
index 1e9d352c5b..a923cdbcea 100644
--- a/src/mc/simgrid_mc.cpp
+++ b/src/mc/simgrid_mc.cpp
@@ -18,44 +18,50 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/wait.h>
+#include <sys/ptrace.h>
+
+#ifdef __linux__
 #include <sys/prctl.h>
+#endif
 
 #include <xbt/log.h>
 
 #include "simgrid/sg_config.h"
-#include "xbt_modinter.h"
+#include "src/xbt_modinter.h"
 
-#include "mc_base.h"
-#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"
+#include "src/mc/mc_base.h"
+#include "src/mc/mc_private.h"
+#include "src/mc/mc_protocol.h"
+#include "src/mc/mc_safety.h"
+#include "src/mc/mc_comm_pattern.h"
+#include "src/mc/mc_liveness.h"
+#include "src/mc/mc_exit.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;
+    return SIMGRID_MC_EXIT_ERROR;
   }
+#endif
+
   int res;
 
   // Remove CLOEXEC in order to pass the socket to the exec-ed program:
   int fdflags = fcntl(socket, F_GETFD, 0);
   if (fdflags == -1) {
     std::perror("simgrid-mc");
-    return MC_SERVER_ERROR;
+    return SIMGRID_MC_EXIT_ERROR;
   }
   if (fcntl(socket, F_SETFD, fdflags & ~FD_CLOEXEC) == -1) {
     std::perror("simgrid-mc");
-    return MC_SERVER_ERROR;
+    return SIMGRID_MC_EXIT_ERROR;
   }
 
   XBT_DEBUG("CLOEXEC removed on socket %i", socket);
@@ -63,40 +69,45 @@ 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)
-    return MC_SERVER_ERROR;
+    return SIMGRID_MC_EXIT_ERROR;
   setenv(MC_ENV_SOCKET_FD, buffer, 1);
 
   execvp(argv[1], argv+1);
-  std::perror("simgrid-mc");
-  return MC_SERVER_ERROR;
+  XBT_ERROR("Could not execute the child process");
+  return SIMGRID_MC_EXIT_ERROR;
 }
 
 static int do_parent(int socket, pid_t child)
 {
   XBT_DEBUG("Inside the parent process");
-  if (mc_server)
+  if (mc_model_checker)
     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_pid(child, socket);
+    mc_model_checker = new simgrid::mc::ModelChecker(child, socket);
+    mc_model_checker->start();
+    int res = 0;
     if (_sg_mc_comms_determinism || _sg_mc_send_determinism)
-      MC_modelcheck_comm_determinism();
+      res = MC_modelcheck_comm_determinism();
     else if (!_sg_mc_property_file || _sg_mc_property_file[0] == '\0')
-      MC_modelcheck_safety();
+      res = MC_modelcheck_safety();
     else
-      MC_modelcheck_liveness();
-    mc_server->shutdown();
-    mc_server->exit();
+      res = MC_modelcheck_liveness();
+    mc_model_checker->shutdown();
+    return res;
   }
   catch(std::exception& e) {
-    XBT_ERROR(e.what());
+    XBT_ERROR("Exception: %s", e.what());
+    return SIMGRID_MC_EXIT_ERROR;
   }
-  exit(MC_SERVER_ERROR);
 }
 
 static char** argvdup(int argc, char** argv)
@@ -109,6 +120,8 @@ static char** argvdup(int argc, char** argv)
 
 int main(int argc, char** argv)
 {
+  _sg_do_model_check = 1;
+
   // We need to keep the original parameters in order to pass them to the
   // model-checked process:
   int argc_copy = argc;
@@ -119,25 +132,6 @@ int main(int argc, char** argv)
   if (argc < 2)
     xbt_die("Missing arguments.\n");
 
-  bool server_mode = true;
-  char* env = std::getenv("SIMGRID_MC_MODE");
-  if (env) {
-    if (std::strcmp(env, "server") == 0)
-      server_mode = true;
-    else if (std::strcmp(env, "standalone") == 0)
-      server_mode = false;
-    else
-      xbt_die("Unrecognised value for SIMGRID_MC_MODE (server/standalone)");
-  }
-
-  if (!server_mode) {
-    setenv(MC_ENV_VARIABLE, "1", 1);
-    execvp(argv[1], argv+1);
-
-    std::perror("simgrid-mc");
-    return 127;
-  }
-
   // Create a AF_LOCAL socketpair:
   int res;
 
@@ -145,7 +139,7 @@ int main(int argc, char** argv)
   res = socketpair(AF_LOCAL, SOCK_DGRAM | SOCK_CLOEXEC, 0, sockets);
   if (res == -1) {
     perror("simgrid-mc");
-    return MC_SERVER_ERROR;
+    return SIMGRID_MC_EXIT_ERROR;
   }
 
   XBT_DEBUG("Created socketpair");
@@ -153,10 +147,12 @@ int main(int argc, char** argv)
   pid_t pid = fork();
   if (pid < 0) {
     perror("simgrid-mc");
-    return MC_SERVER_ERROR;
+    return SIMGRID_MC_EXIT_ERROR;
   } else if (pid == 0) {
     close(sockets[1]);
-    return do_child(sockets[0], argv);
+    int res = do_child(sockets[0], argv);
+    XBT_DEBUG("Error in the child process creation");
+    return res;
   } else {
     close(sockets[0]);
     return do_parent(sockets[1], pid);