X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a900ac9d39fee1b3de240499c5326e5b8d4f44c2..2b431ba179258e63a1a80e611e4294265e61b27c:/src/mc/Session.cpp diff --git a/src/mc/Session.cpp b/src/mc/Session.cpp index dcff662039..8c0926ef6a 100644 --- a/src/mc/Session.cpp +++ b/src/mc/Session.cpp @@ -1,29 +1,22 @@ -/* Copyright (c) 2015-2018. 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 -#include - -#include - -#include "xbt/log.h" -#include "xbt/system_error.hpp" -#include -#include -#include - #include "src/mc/Session.hpp" #include "src/mc/checker/Checker.hpp" +#include "src/mc/mc_config.hpp" #include "src/mc/mc_private.hpp" #include "src/mc/mc_state.hpp" +#include "xbt/log.h" +#include "xbt/system_error.hpp" -#include "src/smpi/include/private.hpp" +#include +#ifdef __linux__ +#include +#endif XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_Session, mc, "Model-checker session"); -extern std::string _sg_mc_dot_output_file; namespace simgrid { namespace mc { @@ -34,18 +27,14 @@ static void setup_child_environment(int socket) // 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: 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: setenv(MC_ENV_VARIABLE, "1", 1); @@ -56,9 +45,8 @@ static void setup_child_environment(int socket) 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); } @@ -68,31 +56,46 @@ static inline pid_t do_fork(F code) { pid_t pid = fork(); - if (pid < 0) - throw simgrid::xbt::errno_error("Could not fork model-checked process"); + xbt_assert(pid >= 0, "Could not fork model-checked process"); if (pid != 0) return pid; // Child-process: - try { - code(); - _exit(EXIT_SUCCESS); - } - catch(...) { - // The callback should catch exceptions: - std::terminate(); - } + code(); + _exit(EXIT_SUCCESS); } -Session::Session(pid_t pid, int socket) +Session::Session(const std::function& code) { - std::unique_ptr process(new simgrid::mc::RemoteClient(pid, socket)); - // TODO, automatic detection of the config from the process - process->privatized(smpi_privatize_global_variables != SmpiPrivStrategies::None); - modelChecker_ = std::unique_ptr( - new simgrid::mc::ModelChecker(std::move(process))); +#if HAVE_SMPI + xbt_assert(smpi_privatize_global_variables != 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 res; + int sockets[2]; + res = socketpair(AF_LOCAL, SOCK_SEQPACKET | SOCK_CLOEXEC, 0, sockets); + if (res == -1) + throw simgrid::xbt::errno_error("Could not create socketpair"); + + pid_t pid = do_fork([sockets, &code] { + ::close(sockets[1]); + setup_child_environment(sockets[0]); + code(); + xbt_die("The model-checked process failed to exec()"); + }); + + // Parent (model-checker): + ::close(sockets[0]); + + std::unique_ptr process(new simgrid::mc::RemoteClient(pid, sockets[1])); + model_checker_.reset(new simgrid::mc::ModelChecker(std::move(process))); + xbt_assert(mc_model_checker == nullptr); - mc_model_checker = modelChecker_.get(); + mc_model_checker = model_checker_.get(); mc_model_checker->start(); } @@ -103,27 +106,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(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 (not _sg_mc_dot_output_file.empty()) { + if (not _sg_mc_dot_output_file.get().empty()) { fprintf(dot_output, "}\n"); fclose(dot_output); } @@ -133,53 +136,12 @@ void Session::logState() } } -// static -Session* Session::fork(std::function code) -{ - // Create a AF_LOCAL socketpair used for exchanging messages - // between the model-checker process (ourselves) and the model-checked - // process: - int res; - int sockets[2]; - res = socketpair(AF_LOCAL, SOCK_SEQPACKET | SOCK_CLOEXEC, 0, sockets); - if (res == -1) - throw simgrid::xbt::errno_error("Could not create socketpair"); - - pid_t pid = do_fork([sockets, &code] { - ::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([path, argv] { - execv(path, argv); - }); -} - -// static -Session* Session::spawnvp(const char *file, char *const argv[]) -{ - return Session::fork([file, argv] { - execvp(file, 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; } }