X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4b5f366a8a5e31aefbd2f2d211ddfe951624df68..633e10e9d14bde1225977c96e1da28d942a21074:/src/mc/simgrid_mc.cpp

diff --git a/src/mc/simgrid_mc.cpp b/src/mc/simgrid_mc.cpp
index 0f3447709f..3d3017d246 100644
--- a/src/mc/simgrid_mc.cpp
+++ b/src/mc/simgrid_mc.cpp
@@ -10,144 +10,91 @@
 #include <cstdio>
 #include <cstring>
 
-#include <signal.h>
-#include <poll.h>
+#include <utility>
 
 #include <unistd.h>
 
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/wait.h>
-
 #include <xbt/log.h>
 
 #include "simgrid/sg_config.h"
-#include "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 "src/xbt_modinter.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"
+#include "src/mc/Session.hpp"
+#include "src/mc/Checker.hpp"
+#include "src/mc/SafetyChecker.hpp"
 
 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());
-  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;
-  }
-  if (fcntl(socket, F_SETFD, fdflags & ~FD_CLOEXEC) == -1) {
-    std::perror("simgrid-mc");
-    return MC_SERVER_ERROR;
-  }
-
-  XBT_DEBUG("CLOEXEC removed on socket %i", socket);
-
-  // Set environment:
-  setenv(MC_ENV_VARIABLE, "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;
-  setenv(MC_ENV_SOCKET_FD, buffer, 1);
-
-  execvp(argv[1], argv+1);
-  std::perror("simgrid-mc");
-  return MC_SERVER_ERROR;
-}
-
-static int do_parent(int socket, pid_t child)
-{
-  XBT_DEBUG("Inside the parent process");
-  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_server->resume(&mc_model_checker->process);
-    mc_server->loop();
-    mc_server->shutdown();
-    mc_server->exit();
-  }
-  catch(std::exception& e) {
-    XBT_ERROR(e.what());
-  }
-  exit(MC_SERVER_ERROR);
-}
-
-static char** argvdup(int argc, char** argv)
+static
+char** argvdup(int argc, char** argv)
 {
   char** argv_copy = xbt_new(char*, argc+1);
   std::memcpy(argv_copy, argv, sizeof(char*) * argc);
-  argv_copy[argc] = NULL;
+  argv_copy[argc] = nullptr;
   return argv_copy;
 }
 
-int main(int argc, char** argv)
+static
+std::unique_ptr<simgrid::mc::Checker> createChecker(simgrid::mc::Session& session)
 {
-  // We need to keep the original parameters in order to pass them to the
-  // model-checked process:
-  int argc_copy = argc;
-  char** argv_copy = argvdup(argc, argv);
-  xbt_log_init(&argc_copy, argv_copy);
-  sg_config_init(&argc_copy, argv_copy);
-
-  if (argc < 2)
-    xbt_die("Missing arguments.\n");
-
-  bool server_mode = false;
-  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_WARN("Unrecognised value for SIMGRID_MC_MODE (server/standalone)");
-  }
+  using simgrid::mc::Session;
+  using simgrid::mc::FunctionalChecker;
+
+  std::function<int(Session& session)> code;
+  if (_sg_mc_comms_determinism || _sg_mc_send_determinism)
+    code = [](Session& session) {
+      return MC_modelcheck_comm_determinism(); };
+  else if (!_sg_mc_property_file || _sg_mc_property_file[0] == '\0')
+    return std::unique_ptr<simgrid::mc::Checker>(
+      new simgrid::mc::SafetyChecker(session));
+  else
+    code = [](Session& session) {
+      return simgrid::mc::modelcheck_liveness(); };
+
+  return std::unique_ptr<simgrid::mc::Checker>(
+    new FunctionalChecker(session, std::move(code)));
+}
 
-  if (!server_mode) {
-    setenv(MC_ENV_VARIABLE, "1", 1);
-    execvp(argv[1], argv+1);
+int main(int argc, char** argv)
+{
+  using simgrid::mc::Session;
 
-    std::perror("simgrid-mc");
-    return 127;
-  }
+  try {
+    if (argc < 2)
+      xbt_die("Missing arguments.\n");
 
-  // Create a AF_LOCAL socketpair:
-  int res;
+    // Currently, we need this before sg_config_init:
+    _sg_do_model_check = 1;
+    mc_mode = MC_MODE_SERVER;
 
-  int sockets[2];
-  res = socketpair(AF_LOCAL, SOCK_DGRAM | SOCK_CLOEXEC, 0, sockets);
-  if (res == -1) {
-    perror("simgrid-mc");
-    return MC_SERVER_ERROR;
+    // The initialisation function can touch argv.
+    // We need to keep the original parameters in order to pass them to the
+    // model-checked process so we make a copy of them:
+    int argc_copy = argc;
+    char** argv_copy = argvdup(argc, argv);
+    xbt_log_init(&argc_copy, argv_copy);
+    sg_config_init(&argc_copy, argv_copy);
+
+    std::unique_ptr<Session> session =
+      std::unique_ptr<Session>(Session::spawnvp(argv[1], argv+1));
+    std::unique_ptr<simgrid::mc::Checker> checker = createChecker(*session);
+    int res = checker->run();
+    session->close();
+    return res;
   }
-
-  XBT_DEBUG("Created socketpair");
-
-  pid_t pid = fork();
-  if (pid < 0) {
-    perror("simgrid-mc");
-    return MC_SERVER_ERROR;
-  } else if (pid == 0) {
-    close(sockets[1]);
-    return do_child(sockets[0], argv);
-  } else {
-    close(sockets[0]);
-    return do_parent(sockets[1], pid);
+  catch(std::exception& e) {
+    XBT_ERROR("Exception: %s", e.what());
+    return SIMGRID_MC_EXIT_ERROR;
+  }
+  catch(...) {
+    XBT_ERROR("Unknown exception");
+    return SIMGRID_MC_EXIT_ERROR;
   }
-
-  return 0;
 }