X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ee24a0654fc881ab672e469396b26542ac5b7df1..67c7181f9993f11534086e9f9e4f2f42408731f3:/src/mc/ModelChecker.cpp diff --git a/src/mc/ModelChecker.cpp b/src/mc/ModelChecker.cpp index 1a52b69629..4da0d06f47 100644 --- a/src/mc/ModelChecker.cpp +++ b/src/mc/ModelChecker.cpp @@ -15,6 +15,7 @@ #include "xbt/system_error.hpp" #include +#include #include #include @@ -40,23 +41,25 @@ ModelChecker::ModelChecker(std::unique_ptr remote_simulation, int void ModelChecker::start() { - checker_side_.start([](evutil_socket_t sig, short events, void* arg) { - auto mc = static_cast(arg); - if (events == EV_READ) { - std::array buffer; - ssize_t size = mc->checker_side_.get_channel().receive(buffer.data(), buffer.size(), false); - if (size == -1 && errno != EAGAIN) - throw simgrid::xbt::errno_error(); - - if (not mc->handle_message(buffer.data(), size)) - mc->checker_side_.break_loop(); - } else if (events == EV_SIGNAL) { - if (sig == SIGCHLD) - mc->handle_waitpid(); - } else { - xbt_die("Unexpected event"); - } - }); + checker_side_.start( + [](evutil_socket_t sig, short events, void* arg) { + auto mc = static_cast(arg); + if (events == EV_READ) { + std::array buffer; + ssize_t size = mc->checker_side_.get_channel().receive(buffer.data(), buffer.size(), false); + if (size == -1 && errno != EAGAIN) + throw simgrid::xbt::errno_error(); + + if (not mc->handle_message(buffer.data(), size)) + mc->checker_side_.break_loop(); + } else if (events == EV_SIGNAL) { + if (sig == SIGCHLD) + mc->handle_waitpid(); + } else { + xbt_die("Unexpected event"); + } + }, + this); XBT_DEBUG("Waiting for the model-checked process"); int status; @@ -64,11 +67,8 @@ void ModelChecker::start() // The model-checked process SIGSTOP itself to signal it's ready: const pid_t pid = remote_process_->pid(); - pid_t res = waitpid(pid, &status, WAITPID_CHECKED_FLAGS); - if (res < 0 || not WIFSTOPPED(status) || WSTOPSIG(status) != SIGSTOP) - xbt_die("Could not wait model-checked process"); - - remote_process_->init(); + xbt_assert(waitpid(pid, &status, WAITPID_CHECKED_FLAGS) == pid && WIFSTOPPED(status) && WSTOPSIG(status) == SIGSTOP, + "Could not wait model-checked process"); if (not _sg_mc_dot_output_file.get().empty()) MC_init_dot_output(); @@ -107,11 +107,12 @@ void ModelChecker::shutdown() { XBT_DEBUG("Shutting down model-checker"); - RemoteProcess* process = &this->get_remote_process(); - if (process->running()) { + RemoteProcess& process = get_remote_process(); + if (process.running()) { XBT_DEBUG("Killing process"); - kill(process->pid(), SIGKILL); - process->terminate(); + finalize_app(true); + kill(process.pid(), SIGKILL); + process.terminate(); } } @@ -138,7 +139,7 @@ static void MC_report_crash(int status) for (auto const& s : mc_model_checker->getChecker()->get_textual_trace()) XBT_INFO(" %s", s.c_str()); dumpRecordPath(); - session->log_state(); + session_singleton->log_state(); if (xbt_log_no_loc) { XBT_INFO("Stack trace not displayed because you passed --log=no_loc"); } else { @@ -147,18 +148,6 @@ static void MC_report_crash(int status) } } -static void MC_report_assertion_error() -{ - XBT_INFO("**************************"); - XBT_INFO("*** PROPERTY NOT VALID ***"); - XBT_INFO("**************************"); - XBT_INFO("Counter-example execution trace:"); - for (auto const& s : mc_model_checker->getChecker()->get_textual_trace()) - XBT_INFO(" %s", s.c_str()); - dumpRecordPath(); - session->log_state(); -} - bool ModelChecker::handle_message(const char* buffer, ssize_t size) { s_mc_message_t base_message; @@ -166,6 +155,15 @@ bool ModelChecker::handle_message(const char* buffer, ssize_t size) memcpy(&base_message, buffer, sizeof(base_message)); switch(base_message.type) { + case MessageType::INITIAL_ADDRESSES: { + s_mc_message_initial_addresses_t message; + xbt_assert(size == sizeof(message), "Broken message. Got %d bytes instead of %d.", (int)size, (int)sizeof(message)); + memcpy(&message, buffer, sizeof(message)); + + get_remote_process().init(message.mmalloc_default_mdp, message.maxpid, message.actors, message.dead_actors); + break; + } + case MessageType::IGNORE_HEAP: { s_mc_message_ignore_heap_t message; xbt_assert(size == sizeof(message), "Broken message"); @@ -225,7 +223,15 @@ bool ModelChecker::handle_message(const char* buffer, ssize_t size) return false; case MessageType::ASSERTION_FAILED: - MC_report_assertion_error(); + XBT_INFO("**************************"); + XBT_INFO("*** PROPERTY NOT VALID ***"); + XBT_INFO("**************************"); + XBT_INFO("Counter-example execution trace:"); + for (auto const& s : getChecker()->get_textual_trace()) + XBT_INFO(" %s", s.c_str()); + dumpRecordPath(); + session_singleton->log_state(); + this->exit(SIMGRID_MC_EXIT_SAFETY); default: @@ -237,9 +243,7 @@ bool ModelChecker::handle_message(const char* buffer, ssize_t size) /** Terminate the model-checker application */ void ModelChecker::exit(int status) { - // TODO, terminate the model checker politely instead of exiting rudely - if (get_remote_process().running()) - kill(get_remote_process().pid(), SIGKILL); + shutdown(); ::exit(status); } @@ -267,7 +271,8 @@ void ModelChecker::handle_waitpid() xbt_assert(ptrace(PTRACE_GETEVENTMSG, remote_process_->pid(), 0, &status) != -1, "Could not get exit status"); if (WIFSIGNALED(status)) { MC_report_crash(status); - exit(SIMGRID_MC_EXIT_PROGRAM_CRASH); + this->get_remote_process().terminate(); + this->exit(SIMGRID_MC_EXIT_PROGRAM_CRASH); } } #endif @@ -286,7 +291,8 @@ void ModelChecker::handle_waitpid() else if (WIFSIGNALED(status)) { MC_report_crash(status); - mc_model_checker->exit(SIMGRID_MC_EXIT_PROGRAM_CRASH); + this->get_remote_process().terminate(); + this->exit(SIMGRID_MC_EXIT_PROGRAM_CRASH); } else if (WIFEXITED(status)) { XBT_DEBUG("Child process is over"); this->get_remote_process().terminate(); @@ -307,14 +313,14 @@ void ModelChecker::handle_simcall(Transition const& transition) s_mc_message_simcall_handle_t m; memset(&m, 0, sizeof(m)); m.type = MessageType::SIMCALL_HANDLE; - m.pid_ = transition.pid_; + m.aid_ = transition.aid_; m.times_considered_ = transition.times_considered_; checker_side_.get_channel().send(m); this->remote_process_->clear_cache(); if (this->remote_process_->running()) checker_side_.dispatch(); } -bool ModelChecker::simcall_is_visible(int aid) +bool ModelChecker::simcall_is_visible(aid_t aid) { xbt_assert(mc_model_checker != nullptr, "This should be called from the checker side"); @@ -333,13 +339,13 @@ bool ModelChecker::simcall_is_visible(int aid) to_c_str(answer.type), (int)answer.type, (int)s, (int)MessageType::SIMCALL_IS_VISIBLE_ANSWER, (int)sizeof(answer)); - XBT_DEBUG("is_visible(%d) is returning %s", aid, answer.value ? "true" : "false"); + XBT_DEBUG("is_visible(%ld) is returning %s", aid, answer.value ? "true" : "false"); this->remote_process_->clear_cache(); return answer.value; } -std::string ModelChecker::simcall_to_string(MessageType type, int aid, int times_considered) +std::string ModelChecker::simcall_to_string(MessageType type, aid_t aid, int times_considered) { xbt_assert(mc_model_checker != nullptr, "This should be called from the checker side"); @@ -362,24 +368,35 @@ std::string ModelChecker::simcall_to_string(MessageType type, int aid, int times return std::string(answer.value); } -std::string ModelChecker::simcall_to_string(int aid, int times_considered) +std::string ModelChecker::simcall_to_string(aid_t aid, int times_considered) { std::string answer = simcall_to_string(MessageType::SIMCALL_TO_STRING, aid, times_considered); - XBT_DEBUG("to_string(%d) is returning %s", aid, answer.c_str()); + XBT_DEBUG("to_string(%ld) is returning %s", aid, answer.c_str()); return answer; } -std::string ModelChecker::simcall_dot_label(int aid, int times_considered) +std::string ModelChecker::simcall_dot_label(aid_t aid, int times_considered) { std::string answer = simcall_to_string(MessageType::SIMCALL_DOT_LABEL, aid, times_considered); - XBT_DEBUG("dot_label(%d) is returning %s", aid, answer.c_str()); + XBT_DEBUG("dot_label(%ld) is returning %s", aid, answer.c_str()); return answer; } +void ModelChecker::finalize_app(bool terminate_asap) +{ + s_mc_message_int_t m; + memset(&m, 0, sizeof m); + m.type = MessageType::FINALIZE; + m.value = terminate_asap; + xbt_assert(checker_side_.get_channel().send(m) == 0, "Could not ask the app to finalize on need"); + + s_mc_message_t answer; + xbt_assert(checker_side_.get_channel().receive(answer) != -1, "Could not receive answer to FINALIZE"); +} + bool ModelChecker::checkDeadlock() { - int res = checker_side_.get_channel().send(MessageType::DEADLOCK_CHECK); - xbt_assert(res == 0, "Could not check deadlock state"); + xbt_assert(checker_side_.get_channel().send(MessageType::DEADLOCK_CHECK) == 0, "Could not check deadlock state"); s_mc_message_int_t message; ssize_t s = checker_side_.get_channel().receive(message); xbt_assert(s != -1, "Could not receive message");