X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fe6a4a0cfb04cbe8c0bbd93c7bf6c29ec017ddec..e88fcca408491a220b09ee34cad8afa872b0ceaa:/src/mc/api/RemoteApp.cpp diff --git a/src/mc/api/RemoteApp.cpp b/src/mc/api/RemoteApp.cpp index 5edd18ca02..64aed11e6e 100644 --- a/src/mc/api/RemoteApp.cpp +++ b/src/mc/api/RemoteApp.cpp @@ -7,18 +7,21 @@ #include "src/internal_config.h" // HAVE_SMPI #include "src/mc/explo/Exploration.hpp" #include "src/mc/mc_config.hpp" +#include "xbt/asserts.h" #if HAVE_SMPI #include "smpi/smpi.h" #include "src/smpi/include/private.hpp" #endif +#include "signal.h" #include "src/mc/api/State.hpp" +#include "src/mc/mc_config.hpp" #include "src/mc/mc_exit.hpp" #include "src/mc/mc_private.hpp" #include "xbt/log.h" #include "xbt/system_error.hpp" -#include "signal.h" #include +#include #include #include @@ -30,9 +33,16 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_Session, mc, "Model-checker session"); XBT_LOG_EXTERNAL_CATEGORY(mc_global); +static simgrid::config::Flag _sg_mc_setenv{ + "model-check/setenv", "Extra environment variables to pass to the child process (ex: 'AZE=aze;QWE=qwe').", "", + [](std::string_view value) { + xbt_assert(value.empty() || value.find('=', 0) != std::string_view::npos, + "The 'model-check/setenv' parameter must be like 'AZE=aze', but it does not contain an equal sign."); + }}; + namespace simgrid::mc { -template void run_child_process(int socket, Code code) +static void run_child_process(int socket, const std::vector& args) { /* On startup, simix_global_init() calls simgrid::mc::Client::initialize(), which checks whether the MC_ENV_SOCKET_FD * env variable is set. If so, MC mode is assumed, and the client is setup from its side @@ -53,10 +63,42 @@ template void run_child_process(int socket, Code code) setenv(MC_ENV_SOCKET_FD, std::to_string(socket).c_str(), 1); - code(); + /* Setup the tokenizer that parses the cfg:model-check/setenv parameter */ + using Tokenizer = boost::tokenizer>; + boost::char_separator semicol_sep(";"); + boost::char_separator equal_sep("="); + Tokenizer token_vars(_sg_mc_setenv.get(), semicol_sep); /* Iterate over all FOO=foo parts */ + for (const auto& token : token_vars) { + std::vector kv; + Tokenizer token_kv(token, equal_sep); + for (const auto& t : token_kv) /* Iterate over 'FOO' and then 'foo' in that 'FOO=foo' */ + kv.push_back(t); + xbt_assert(kv.size() == 2, "Parse error on 'model-check/setenv' value %s. Does it contain an equal sign?", + token.c_str()); + XBT_INFO("setenv '%s'='%s'", kv[0].c_str(), kv[1].c_str()); + setenv(kv[0].c_str(), kv[1].c_str(), 1); + } + + /* And now, exec the child process */ + int i = 1; + while (args[i] != nullptr && args[i][0] == '-') + i++; + + xbt_assert(args[i] != nullptr, + "Unable to find a binary to exec on the command line. Did you only pass config flags?"); + + execvp(args[i], args.data() + i); + XBT_CRITICAL("The model-checked process failed to exec(%s): %s.\n" + " Make sure that your binary exists on disk and is executable.", + args[i], strerror(errno)); + if (strchr(args[i], '=') != nullptr) + XBT_CRITICAL("If you want to pass environment variables to the application, please use --cfg=model-check/setenv:%s", + args[i]); + + xbt_die("Aborting now."); } -RemoteApp::RemoteApp(const std::function& code) +RemoteApp::RemoteApp(const std::vector& args) { #if HAVE_SMPI smpi_init_options(); // only performed once @@ -75,7 +117,7 @@ RemoteApp::RemoteApp(const std::function& code) if (pid == 0) { // Child ::close(sockets[1]); - run_child_process(sockets[0], code); + run_child_process(sockets[0], args); DIE_IMPOSSIBLE; } @@ -96,31 +138,6 @@ RemoteApp::RemoteApp(const std::function& code) } RemoteApp::~RemoteApp() -{ - this->close(); -} - -void RemoteApp::restore_initial_state() const -{ - this->initial_snapshot_->restore(&model_checker_->get_remote_process()); -} - -void RemoteApp::log_state() const -{ - model_checker_->get_exploration()->log_state(); - - if (not _sg_mc_dot_output_file.get().empty()) { - fprintf(dot_output, "}\n"); - fclose(dot_output); - } - if (getenv("SIMGRID_MC_SYSTEM_STATISTICS")) { - int ret = system("free"); - if (ret != 0) - XBT_WARN("Call to system(free) did not return 0, but %d", ret); - } -} - -void RemoteApp::close() { initial_snapshot_ = nullptr; if (model_checker_) { @@ -130,12 +147,17 @@ void RemoteApp::close() } } +void RemoteApp::restore_initial_state() const +{ + this->initial_snapshot_->restore(&model_checker_->get_remote_process()); +} + unsigned long RemoteApp::get_maxpid() const { return model_checker_->get_remote_process().get_maxpid(); } -void RemoteApp::get_actors_status(std::map& whereto) +void RemoteApp::get_actors_status(std::map& whereto) const { s_mc_message_t msg; memset(&msg, 0, sizeof msg); @@ -151,13 +173,16 @@ void RemoteApp::get_actors_status(std::map& whereto) to_c_str(answer.type), (int)answer.type, (int)received, (int)MessageType::ACTORS_STATUS_REPLY, (int)sizeof(answer)); - s_mc_message_actors_status_one_t status[answer.count]; - received = model_checker_->channel().receive(&status, sizeof(status)); - xbt_assert(static_cast(received) == sizeof(status)); + std::vector status(answer.count); + if (answer.count > 0) { + size_t size = status.size() * sizeof(s_mc_message_actors_status_one_t); + received = model_checker_->channel().receive(status.data(), size); + xbt_assert(static_cast(received) == size); + } whereto.clear(); for (auto const& actor : status) - whereto.insert(std::make_pair(actor.aid, ActorState(actor.aid, actor.enabled, actor.max_considered))); + whereto.try_emplace(actor.aid, actor.aid, actor.enabled, actor.max_considered); } void RemoteApp::check_deadlock() const @@ -173,14 +198,13 @@ void RemoteApp::check_deadlock() const (int)sizeof(message)); if (message.value != 0) { - XBT_CINFO(mc_global, "**************************"); - XBT_CINFO(mc_global, "*** DEADLOCK DETECTED ***"); - XBT_CINFO(mc_global, "**************************"); XBT_CINFO(mc_global, "Counter-example execution trace:"); for (auto const& frame : model_checker_->get_exploration()->get_textual_trace()) XBT_CINFO(mc_global, " %s", frame.c_str()); - XBT_CINFO(mc_global, "Path = %s", model_checker_->get_exploration()->get_record_trace().to_string().c_str()); - log_state(); + XBT_INFO("You can debug the problem (and see the whole details) by rerunning out of simgrid-mc with " + "--cfg=model-check/replay:'%s'", + model_checker_->get_exploration()->get_record_trace().to_string().c_str()); + model_checker_->get_exploration()->log_state(); throw DeadlockError(); } }