X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/047872771f0685df5ad0db3422b3333e26696330..7207080bb744f50a6d8c418f25d82ad69e9b4f44:/src/mc/ModelChecker.cpp diff --git a/src/mc/ModelChecker.cpp b/src/mc/ModelChecker.cpp index adb52a96a1..f50fac1a16 100644 --- a/src/mc/ModelChecker.cpp +++ b/src/mc/ModelChecker.cpp @@ -1,40 +1,25 @@ -/* Copyright (c) 2008-2018. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2008-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 "xbt/automaton.h" -#include "xbt/automaton.hpp" -#include "xbt/log.h" -#include "xbt/system_error.hpp" - -#include "simgrid/sg_config.hpp" - #include "src/mc/ModelChecker.hpp" -#include "src/mc/ModelChecker.hpp" -#include "src/mc/PageStore.hpp" +#include "src/mc/Session.hpp" #include "src/mc/Transition.hpp" #include "src/mc/checker/Checker.hpp" +#include "src/mc/mc_config.hpp" #include "src/mc/mc_exit.hpp" #include "src/mc/mc_private.hpp" -#include "src/mc/mc_record.hpp" -#include "src/mc/remote/mc_protocol.h" +#include "src/mc/remote/RemoteClient.hpp" +#include "xbt/automaton.hpp" +#include "xbt/system_error.hpp" + +#include +#include XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_ModelChecker, mc, "ModelChecker"); ::simgrid::mc::ModelChecker* mc_model_checker = nullptr; -extern std::string _sg_mc_dot_output_file; using simgrid::mc::remote; @@ -53,7 +38,6 @@ ModelChecker::ModelChecker(std::unique_ptr process) , signal_event_(nullptr) , page_store_(500) , process_(std::move(process)) - , parent_snapshot_(nullptr) { } @@ -76,10 +60,7 @@ void ModelChecker::start() { ((ModelChecker *)arg)->handle_events(fd, events); }; - socket_event_ = event_new(base_, - process_->getChannel().getSocket(), - EV_READ|EV_PERSIST, - event_callback, this); + socket_event_ = event_new(base_, process_->get_channel().get_socket(), EV_READ | EV_PERSIST, event_callback, this); event_add(socket_event_, NULL); signal_event_ = event_new(base_, SIGCHLD, @@ -97,7 +78,7 @@ void ModelChecker::start() process_->init(); - if (not _sg_mc_dot_output_file.empty()) + if (not _sg_mc_dot_output_file.get().empty()) MC_init_dot_output(); setup_ignore(); @@ -114,17 +95,7 @@ void ModelChecker::start() static const std::pair ignored_local_variables[] = { std::pair{ "e", "*" }, - std::pair{ "__ex_cleanup", "*" }, - std::pair{ "__ex_mctx_en", "*" }, - std::pair{ "__ex_mctx_me", "*" }, - std::pair{ "__xbt_ex_ctx_ptr", "*" }, std::pair{ "_log_ev", "*" }, - std::pair{ "_throw_ctx", "*" }, - std::pair{ "ctx", "*" }, - - std::pair{ "self", "simcall_BODY_mc_snapshot" }, - std::pair{ "next_context", "smx_ctx_sysv_suspend_serial" }, - std::pair{ "i", "smx_ctx_sysv_suspend_serial" }, /* Ignore local variable about time used for tracing */ std::pair{ "start_time", "*" }, @@ -155,7 +126,7 @@ void ModelChecker::shutdown() void ModelChecker::resume(simgrid::mc::RemoteClient& process) { - int res = process.getChannel().send(MC_MESSAGE_CONTINUE); + int res = process.get_channel().send(MC_MESSAGE_CONTINUE); if (res) throw simgrid::xbt::errno_error(); process.clear_cache(); @@ -175,12 +146,12 @@ static void MC_report_crash(int status) else XBT_INFO("No core dump was generated by the system."); XBT_INFO("Counter-example execution trace:"); + for (auto const& s : mc_model_checker->getChecker()->get_textual_trace()) + XBT_INFO(" %s", s.c_str()); simgrid::mc::dumpRecordPath(); - for (auto const& s : mc_model_checker->getChecker()->getTextualTrace()) - XBT_INFO("%s", s.c_str()); - simgrid::mc::session->logState(); + simgrid::mc::session->log_state(); XBT_INFO("Stack trace:"); - mc_model_checker->process().dumpStack(); + mc_model_checker->process().dump_stack(); } static void MC_report_assertion_error() @@ -189,10 +160,10 @@ static void MC_report_assertion_error() 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()); simgrid::mc::dumpRecordPath(); - for (auto const& s : mc_model_checker->getChecker()->getTextualTrace()) - XBT_INFO("%s", s.c_str()); - simgrid::mc::session->logState(); + simgrid::mc::session->log_state(); } bool ModelChecker::handle_message(char* buffer, ssize_t size) @@ -277,7 +248,6 @@ bool ModelChecker::handle_message(char* buffer, ssize_t size) case MC_MESSAGE_ASSERTION_FAILED: MC_report_assertion_error(); this->exit(SIMGRID_MC_EXIT_SAFETY); - break; default: xbt_die("Unexpected message from model-checked application"); @@ -299,7 +269,7 @@ void ModelChecker::handle_events(int fd, short events) { if (events == EV_READ) { char buffer[MC_MESSAGE_LENGTH]; - ssize_t size = process_->getChannel().receive(buffer, sizeof(buffer), false); + ssize_t size = process_->get_channel().receive(buffer, sizeof(buffer), false); if (size == -1 && errno != EAGAIN) throw simgrid::xbt::errno_error(); if (not handle_message(buffer, size)) { @@ -394,7 +364,7 @@ void ModelChecker::handle_simcall(Transition const& transition) m.type = MC_MESSAGE_SIMCALL_HANDLE; m.pid = transition.pid; m.value = transition.argument; - this->process_->getChannel().send(m); + this->process_->get_channel().send(m); this->process_->clear_cache(); if (this->process_->running()) event_base_dispatch(base_); @@ -403,10 +373,10 @@ void ModelChecker::handle_simcall(Transition const& transition) bool ModelChecker::checkDeadlock() { int res; - if ((res = this->process().getChannel().send(MC_MESSAGE_DEADLOCK_CHECK))) + if ((res = this->process().get_channel().send(MC_MESSAGE_DEADLOCK_CHECK))) xbt_die("Could not check deadlock state"); s_mc_message_int_t message; - ssize_t s = mc_model_checker->process().getChannel().receive(message); + ssize_t s = mc_model_checker->process().get_channel().receive(message); if (s == -1) xbt_die("Could not receive message"); if (s != sizeof(message) || message.type != MC_MESSAGE_DEADLOCK_CHECK_REPLY)