X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4bd2cbe6c40e96efdbf49550cc66bb9e35df8b94..29626b6969473f635cfb4f0734a10d6fb21516ae:/src/mc/Session.cpp

diff --git a/src/mc/Session.cpp b/src/mc/Session.cpp
index 095d4b05dc..8647cc9285 100644
--- a/src/mc/Session.cpp
+++ b/src/mc/Session.cpp
@@ -1,24 +1,23 @@
-/* Copyright (c) 2015-2016. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2015-2019. The SimGrid Team. All rights reserved.          */
 
 /* 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 <fcntl.h>
-#include <signal.h>
-
-#include <functional>
-
-#include <xbt/log.h>
-#include <xbt/system_error.hpp>
-#include <simgrid/sg_config.h>
-#include <simgrid/modelchecker.h>
-#include <mc/mc.h>
-
 #include "src/mc/Session.hpp"
-#include "src/mc/mc_state.h"
-#include "src/mc/mc_private.h"
-#include "src/mc/Checker.hpp"
+#include "src/mc/checker/Checker.hpp"
+#include "src/mc/mc_config.hpp"
+#if HAVE_SMPI
+#include "smpi/smpi.h"
+#endif
+#include "src/mc/mc_private.hpp"
+#include "src/mc/mc_state.hpp"
+#include "xbt/log.h"
+#include "xbt/system_error.hpp"
+
+#include <fcntl.h>
+#ifdef __linux__
+#include <sys/prctl.h>
+#endif
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_Session, mc, "Model-checker session");
 
@@ -28,69 +27,65 @@ namespace mc {
 static void setup_child_environment(int socket)
 {
 #ifdef __linux__
-  // Make sure we do not outlive our parent:
+  // Make sure we do not outlive our parent
   sigset_t mask;
   sigemptyset (&mask);
-  if (sigprocmask(SIG_SETMASK, &mask, nullptr) < 0)
-    throw simgrid::xbt::errno_error("Could not unblock signals");
-  if (prctl(PR_SET_PDEATHSIG, SIGHUP) != 0)
-    throw simgrid::xbt::errno_error("Could not PR_SET_PDEATHSIG");
+  xbt_assert(sigprocmask(SIG_SETMASK, &mask, nullptr) >= 0, "Could not unblock signals");
+  xbt_assert(prctl(PR_SET_PDEATHSIG, SIGHUP) == 0, "Could not PR_SET_PDEATHSIG");
 #endif
 
-  int res;
-
-  // Remove CLOEXEC in order to pass the socket to the exec-ed program:
+  // Remove CLOEXEC to pass the socket to the application
   int fdflags = fcntl(socket, F_GETFD, 0);
-  if (fdflags == -1 || fcntl(socket, F_SETFD, fdflags & ~FD_CLOEXEC) == -1)
-    throw simgrid::xbt::errno_error("Could not remove CLOEXEC for socket");
+  xbt_assert(fdflags != -1 && fcntl(socket, F_SETFD, fdflags & ~FD_CLOEXEC) != -1,
+             "Could not remove CLOEXEC for socket");
 
-  // Set environment:
+  // Set environment so that mmalloc gets used in application
   setenv(MC_ENV_VARIABLE, "1", 1);
 
-  // Disable lazy relocation in the model-checked process.
-  // We don't want the model-checked process to modify its .got.plt during
-  // snapshot.
+  // Disable lazy relocation in the model-checked process to prevent the application from
+  // modifying 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)
-    std::abort();
+  int res = std::snprintf(buffer, sizeof(buffer), "%i", socket);
+  xbt_assert((size_t)res < sizeof(buffer) && res != -1);
   setenv(MC_ENV_SOCKET_FD, buffer, 1);
 }
 
-/** Execute some code in a forked process */
-template<class F>
-static inline
-pid_t do_fork(F code)
+Session::Session(const std::function<void()>& code)
 {
+#if HAVE_SMPI
+  smpi_init_options();//only performed once
+  xbt_assert(smpi_cfg_privatization() != SmpiPrivStrategies::MMAP,
+             "Please use the dlopen privatization schema when model-checking SMPI code");
+#endif
+
+  // Create a AF_LOCAL socketpair used for exchanging messages
+  // between the model-checker process (ourselves) and the model-checked
+  // process:
+  int sockets[2];
+  int res = socketpair(AF_LOCAL, SOCK_SEQPACKET | SOCK_CLOEXEC, 0, sockets);
+  xbt_assert(res != -1, "Could not create socketpair");
+
   pid_t pid = fork();
-  if (pid < 0)
-    throw simgrid::xbt::errno_error("Could not fork model-checked process");
-  if (pid != 0)
-    return pid;
+  xbt_assert(pid >= 0, "Could not fork model-checked process");
 
-  // Child-process:
-  try {
+  if (pid == 0) { // Child
+    ::close(sockets[1]);
+    setup_child_environment(sockets[0]);
     code();
-    _exit(EXIT_SUCCESS);
-  }
-  catch(...) {
-    // The callback should catch exceptions:
-    std::terminate();
+    xbt_die("The model-checked process failed to exec()");
   }
-}
 
-Session::Session(pid_t pid, int socket)
-{
-  std::unique_ptr<simgrid::mc::Process> process(new simgrid::mc::Process(pid, socket));
-  // TODO, automatic detection of the config from the process
-  process->privatized(
-    xbt_cfg_get_boolean("smpi/privatize_global_variables"));
-  modelChecker_ = std::unique_ptr<ModelChecker>(
-    new simgrid::mc::ModelChecker(std::move(process)));
-  xbt_assert(mc_model_checker == nullptr);
-  mc_model_checker = modelChecker_.get();
+  // Parent (model-checker):
+  ::close(sockets[0]);
+
+  xbt_assert(mc_model_checker == nullptr, "Did you manage to start the MC twice in this process?");
+
+  std::unique_ptr<simgrid::mc::RemoteClient> process(new simgrid::mc::RemoteClient(pid, sockets[1]));
+  model_checker_.reset(new simgrid::mc::ModelChecker(std::move(process)));
+
+  mc_model_checker = model_checker_.get();
   mc_model_checker->start();
 }
 
@@ -101,27 +96,27 @@ Session::~Session()
 
 void Session::initialize()
 {
-  xbt_assert(initialSnapshot_ == nullptr);
+  xbt_assert(initial_snapshot_ == nullptr);
   mc_model_checker->wait_for_requests();
-  initialSnapshot_ = simgrid::mc::take_snapshot(0);
+  initial_snapshot_ = std::make_shared<simgrid::mc::Snapshot>(0);
 }
 
 void Session::execute(Transition const& transition)
 {
-  modelChecker_->handle_simcall(transition);
-  modelChecker_->wait_for_requests();
+  model_checker_->handle_simcall(transition);
+  model_checker_->wait_for_requests();
 }
 
-void Session::restoreInitialState()
+void Session::restore_initial_state()
 {
-  simgrid::mc::restore_snapshot(this->initialSnapshot_);
+  this->initial_snapshot_->restore(&mc_model_checker->process());
 }
 
-void Session::logState()
+void Session::log_state()
 {
-  mc_model_checker->getChecker()->logState();
+  mc_model_checker->getChecker()->log_state();
 
-  if ((_sg_mc_dot_output_file != nullptr) && (_sg_mc_dot_output_file[0] != '\0')) {
+  if (not _sg_mc_dot_output_file.get().empty()) {
     fprintf(dot_output, "}\n");
     fclose(dot_output);
   }
@@ -131,53 +126,12 @@ void Session::logState()
   }
 }
 
-// static
-Session* Session::fork(std::function<void(void)> code)
-{
-  // Create a AF_LOCAL socketpair used for exchanging messages
-  // bewteen the model-checker process (ourselves) and the model-checked
-  // process:
-  int res;
-  int sockets[2];
-  res = socketpair(AF_LOCAL, SOCK_DGRAM | SOCK_CLOEXEC, 0, sockets);
-  if (res == -1)
-    throw simgrid::xbt::errno_error("Could not create socketpair");
-
-  pid_t pid = do_fork([&] {
-    ::close(sockets[1]);
-    setup_child_environment(sockets[0]);
-    code();
-    xbt_die("The model-checked process failed to exec()");
-  });
-
-  // Parent (model-checker):
-  ::close(sockets[0]);
-
-  return new Session(pid, sockets[1]);
-}
-
-// static
-Session* Session::spawnv(const char *path, char *const argv[])
-{
-  return Session::fork([&] {
-    execv(path, argv);
-  });
-}
-
-// static
-Session* Session::spawnvp(const char *path, char *const argv[])
-{
-  return Session::fork([&] {
-    execvp(path, argv);
-  });
-}
-
 void Session::close()
 {
-  initialSnapshot_ = nullptr;
-  if (modelChecker_) {
-    modelChecker_->shutdown();
-    modelChecker_ = nullptr;
+  initial_snapshot_ = nullptr;
+  if (model_checker_) {
+    model_checker_->shutdown();
+    model_checker_   = nullptr;
     mc_model_checker = nullptr;
   }
 }