X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/db5adf7439201fb67d1d697b86806d58ace9fe85..ef1af4e53dff6d26dcfabafed5e78b461866071f:/src/mc/Session.cpp diff --git a/src/mc/Session.cpp b/src/mc/Session.cpp index d29fbeb707..f5d8944889 100644 --- a/src/mc/Session.cpp +++ b/src/mc/Session.cpp @@ -1,21 +1,26 @@ -/* Copyright (c) 2015-2020. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2015-2022. 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 "src/mc/Session.hpp" -#include "src/mc/checker/Checker.hpp" -#include "src/mc/mc_config.hpp" #include "src/internal_config.h" // HAVE_SMPI +#include "src/mc/explo/Exploration.hpp" +#include "src/mc/mc_config.hpp" #if HAVE_SMPI #include "smpi/smpi.h" +#include "src/smpi/include/private.hpp" #endif +#include "src/mc/api/State.hpp" +#include "src/mc/mc_exit.hpp" #include "src/mc/mc_private.hpp" -#include "src/mc/mc_state.hpp" #include "xbt/log.h" #include "xbt/system_error.hpp" +#include "signal.h" +#include #include +#include #include #ifdef __linux__ @@ -23,9 +28,9 @@ #endif XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_Session, mc, "Model-checker session"); +XBT_LOG_EXTERNAL_CATEGORY(mc_global); -namespace simgrid { -namespace mc { +namespace simgrid::mc { template void run_child_process(int socket, Code code) { @@ -46,14 +51,7 @@ template void run_child_process(int socket, Code code) xbt_assert(fdflags != -1 && fcntl(socket, F_SETFD, fdflags & ~FD_CLOEXEC) != -1, "Could not remove CLOEXEC for socket"); - // 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]; - 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); + setenv(MC_ENV_SOCKET_FD, std::to_string(socket).c_str(), 1); code(); } @@ -70,8 +68,7 @@ Session::Session(const std::function& code) // 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"); + xbt_assert(socketpair(AF_LOCAL, SOCK_SEQPACKET | SOCK_CLOEXEC, 0, sockets) != -1, "Could not create socketpair"); pid_t pid = fork(); xbt_assert(pid >= 0, "Could not fork model-checked process"); @@ -87,7 +84,7 @@ Session::Session(const std::function& code) xbt_assert(mc_model_checker == nullptr, "Did you manage to start the MC twice in this process?"); - auto process = std::make_unique(pid); + auto process = std::make_unique(pid); model_checker_ = std::make_unique(std::move(process), sockets[1]); mc_model_checker = model_checker_.get(); @@ -99,28 +96,22 @@ Session::~Session() this->close(); } -/** Take the initial snapshot of the application, that must be stopped. */ -void Session::initialize() +/** The application must be stopped. */ +void Session::take_initial_snapshot() { xbt_assert(initial_snapshot_ == nullptr); model_checker_->wait_for_requests(); initial_snapshot_ = std::make_shared(0); } -void Session::execute(Transition const& transition) const -{ - model_checker_->handle_simcall(transition); - model_checker_->wait_for_requests(); -} - void Session::restore_initial_state() const { - this->initial_snapshot_->restore(&model_checker_->get_remote_simulation()); + this->initial_snapshot_->restore(&model_checker_->get_remote_process()); } void Session::log_state() const { - model_checker_->getChecker()->log_state(); + model_checker_->get_exploration()->log_state(); if (not _sg_mc_dot_output_file.get().empty()) { fprintf(dot_output, "}\n"); @@ -145,15 +136,39 @@ void Session::close() bool Session::actor_is_enabled(aid_t pid) const { - s_mc_message_actor_enabled_t msg{MC_MESSAGE_ACTOR_ENABLED, pid}; + s_mc_message_actor_enabled_t msg; + memset(&msg, 0, sizeof msg); + msg.type = simgrid::mc::MessageType::ACTOR_ENABLED; + msg.aid = pid; model_checker_->channel().send(msg); - char buff[MC_MESSAGE_LENGTH]; - ssize_t received = model_checker_->channel().receive(buff, MC_MESSAGE_LENGTH, true); + std::array buff; + ssize_t received = model_checker_->channel().receive(buff.data(), buff.size(), true); xbt_assert(received == sizeof(s_mc_message_int_t), "Unexpected size in answer to ACTOR_ENABLED"); - return ((s_mc_message_int_t*)buff)->value; + return ((s_mc_message_int_t*)buff.data())->value; } -simgrid::mc::Session* session; - -} +void Session::check_deadlock() const +{ + xbt_assert(model_checker_->channel().send(MessageType::DEADLOCK_CHECK) == 0, "Could not check deadlock state"); + s_mc_message_int_t message; + ssize_t s = model_checker_->channel().receive(message); + xbt_assert(s != -1, "Could not receive message"); + xbt_assert(s == sizeof(message) && message.type == MessageType::DEADLOCK_CHECK_REPLY, + "Received unexpected message %s (%i, size=%i) " + "expected MessageType::DEADLOCK_CHECK_REPLY (%i, size=%i)", + to_c_str(message.type), (int)message.type, (int)s, (int)MessageType::DEADLOCK_CHECK_REPLY, + (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(); + throw DeadlockError(); + } } +} // namespace simgrid::mc