X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/bbf8aab8704722fb68397b9b1c15251e79efac6a..7f5e78a43b4bed7bae8304ad12de6e2e555b34db:/src/mc/Session.cpp diff --git a/src/mc/Session.cpp b/src/mc/Session.cpp index 99696652ab..4d73338e5f 100644 --- a/src/mc/Session.cpp +++ b/src/mc/Session.cpp @@ -1,24 +1,20 @@ -/* 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 -#include - -#include - -#include -#include -#include -#include -#include - #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" +#include "src/mc/mc_private.hpp" +#include "src/mc/mc_state.hpp" +#include "xbt/log.h" +#include "xbt/system_error.hpp" + +#include +#ifdef __linux__ +#include +#endif XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_Session, mc, "Model-checker session"); @@ -32,9 +28,9 @@ static void setup_child_environment(int socket) sigset_t mask; sigemptyset (&mask); if (sigprocmask(SIG_SETMASK, &mask, nullptr) < 0) - throw simgrid::xbt::errno_error(errno, "Could not unblock signals"); + throw simgrid::xbt::errno_error("Could not unblock signals"); if (prctl(PR_SET_PDEATHSIG, SIGHUP) != 0) - throw simgrid::xbt::errno_error(errno, "Could not PR_SET_PDEATHSIG"); + throw simgrid::xbt::errno_error("Could not PR_SET_PDEATHSIG"); #endif int res; @@ -42,7 +38,7 @@ static void setup_child_environment(int socket) // 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(errno, "Could not remove CLOEXEC for socket"); + throw simgrid::xbt::errno_error("Could not remove CLOEXEC for socket"); // Set environment: setenv(MC_ENV_VARIABLE, "1", 1); @@ -66,7 +62,7 @@ pid_t do_fork(F code) { pid_t pid = fork(); if (pid < 0) - throw simgrid::xbt::errno_error(errno, "Could not fork model-checked process"); + throw simgrid::xbt::errno_error("Could not fork model-checked process"); if (pid != 0) return pid; @@ -81,16 +77,37 @@ pid_t do_fork(F code) } } -Session::Session(pid_t pid, int socket) +Session::Session(const std::function& code) { - std::unique_ptr 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( - 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(); } @@ -101,27 +118,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 ((_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 +148,12 @@ void Session::logState() } } -// static -Session* Session::fork(std::function 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(errno, "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; } }