X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fce872a4f145c997f146ea0d098a77549a47bd0b..864d17d38d2f5ffecea2c9104af9e538a25b56db:/src/mc/ModelChecker.cpp diff --git a/src/mc/ModelChecker.cpp b/src/mc/ModelChecker.cpp index 2a870fa8d6..6ff138a051 100644 --- a/src/mc/ModelChecker.cpp +++ b/src/mc/ModelChecker.cpp @@ -19,25 +19,21 @@ #include #include #include +#include #include "simgrid/sg_config.h" -#include "ModelChecker.hpp" -#include "PageStore.hpp" -#include "ModelChecker.hpp" -#include "mc_protocol.h" -#include "mc_private.h" -#include "mc_ignore.h" -#include "mcer_ignore.h" -#include "mc_exit.h" +#include "src/mc/ModelChecker.hpp" +#include "src/mc/PageStore.hpp" +#include "src/mc/ModelChecker.hpp" +#include "src/mc/mc_protocol.h" +#include "src/mc/mc_private.h" +#include "src/mc/mc_ignore.h" +#include "src/mc/mc_exit.h" #include "src/mc/mc_liveness.h" -extern "C" { - XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_ModelChecker, mc, "ModelChecker"); -} - ::simgrid::mc::ModelChecker* mc_model_checker = nullptr; using simgrid::mc::remote; @@ -49,12 +45,13 @@ using simgrid::mc::remote; namespace simgrid { namespace mc { -ModelChecker::ModelChecker(pid_t pid, int socket) : - pid_(pid), socket_(socket), +ModelChecker::ModelChecker(std::unique_ptr process) : hostnames_(xbt_dict_new()), page_store_(500), + process_(std::move(process)), parent_snapshot_(nullptr) { + } ModelChecker::~ModelChecker() @@ -76,12 +73,14 @@ const char* ModelChecker::get_host_name(const char* hostname) void ModelChecker::start() { + const pid_t pid = process_->pid(); + // Block SIGCHLD (this will be handled with accept/signalfd): sigset_t set; sigemptyset(&set); sigaddset(&set, SIGCHLD); if (sigprocmask(SIG_BLOCK, &set, nullptr) == -1) - throw std::system_error(errno, std::system_category()); + throw simgrid::xbt::errno_error(errno); sigset_t full_set; sigfillset(&full_set); @@ -89,13 +88,13 @@ void ModelChecker::start() // Prepare data for poll: struct pollfd* socket_pollfd = &fds_[SOCKET_FD_INDEX]; - socket_pollfd->fd = socket_; + socket_pollfd->fd = process_->getChannel().getSocket(); socket_pollfd->events = POLLIN; socket_pollfd->revents = 0; int signal_fd = signalfd(-1, &set, 0); if (signal_fd == -1) - throw std::system_error(errno, std::system_category()); + throw simgrid::xbt::errno_error(errno); struct pollfd* signalfd_pollfd = &fds_[SIGNAL_FD_INDEX]; signalfd_pollfd->fd = signal_fd; @@ -106,14 +105,11 @@ void ModelChecker::start() int status; // The model-checked process SIGSTOP itself to signal it's ready: - pid_t res = waitpid(pid_, &status, __WALL); + pid_t res = waitpid(pid, &status, __WALL); if (res < 0 || !WIFSTOPPED(status) || WSTOPSIG(status) != SIGSTOP) xbt_die("Could not wait model-checked process"); - assert(process_ == nullptr); - process_ = std::unique_ptr(new Process(pid_, socket_)); - // TODO, avoid direct dependency on sg_cfg - process_->privatized(sg_cfg_get_boolean("smpi/privatize_global_variables")); + process_->init(); /* Initialize statistics */ mc_stats = xbt_new0(s_mc_stats_t, 1); @@ -127,35 +123,40 @@ void ModelChecker::start() setup_ignore(); - ptrace(PTRACE_SETOPTIONS, pid_, nullptr, PTRACE_O_TRACEEXIT); - ptrace(PTRACE_CONT, pid_, 0, 0); + ptrace(PTRACE_SETOPTIONS, pid, nullptr, PTRACE_O_TRACEEXIT); + ptrace(PTRACE_CONT, pid, 0, 0); } -void ModelChecker::setup_ignore() -{ - /* Ignore some variables from xbt/ex.h used by exception e for stacks comparison */ - MC_ignore_local_variable("e", "*"); - MC_ignore_local_variable("__ex_cleanup", "*"); - MC_ignore_local_variable("__ex_mctx_en", "*"); - MC_ignore_local_variable("__ex_mctx_me", "*"); - MC_ignore_local_variable("__xbt_ex_ctx_ptr", "*"); - MC_ignore_local_variable("_log_ev", "*"); - MC_ignore_local_variable("_throw_ctx", "*"); - MC_ignore_local_variable("ctx", "*"); - - MC_ignore_local_variable("self", "simcall_BODY_mc_snapshot"); - MC_ignore_local_variable("next_cont" - "ext", "smx_ctx_sysv_suspend_serial"); - MC_ignore_local_variable("i", "smx_ctx_sysv_suspend_serial"); +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 */ - MC_ignore_local_variable("start_time", "*"); + std::pair{ "start_time", "*" }, +}; + +void ModelChecker::setup_ignore() +{ + Process& process = this->process(); + for (std::pair const& var : + ignored_local_variables) + process.ignore_local_variable(var.first, var.second); /* Static variable used for tracing */ - this->process().ignore_global_variable("counter"); + process.ignore_global_variable("counter"); /* SIMIX */ - this->process().ignore_global_variable("smx_total_comms"); + process.ignore_global_variable("smx_total_comms"); } void ModelChecker::shutdown() @@ -172,10 +173,10 @@ void ModelChecker::shutdown() void ModelChecker::resume(simgrid::mc::Process& process) { - int res = process.send_message(MC_MESSAGE_CONTINUE); + int res = process.getChannel().send(MC_MESSAGE_CONTINUE); if (res) - throw std::system_error(res, std::system_category()); - process.cache_flags = (mc_process_cache_flags_t) 0; + throw simgrid::xbt::errno_error(res); + process.clear_cache(); } static @@ -185,7 +186,7 @@ void throw_socket_error(int fd) socklen_t errlen = sizeof(error); if (getsockopt(fd, SOL_SOCKET, SO_ERROR, (void *)&error, &errlen) == -1) error = errno; - throw std::system_error(error, std::system_category()); + throw simgrid::xbt::errno_error(errno); } bool ModelChecker::handle_message(char* buffer, ssize_t size) @@ -203,9 +204,13 @@ bool ModelChecker::handle_message(char* buffer, ssize_t size) if (size != sizeof(message)) xbt_die("Broken messsage"); memcpy(&message, buffer, sizeof(message)); - mc_heap_ignore_region_t region = xbt_new(s_mc_heap_ignore_region_t, 1); - *region = message.region; - MC_heap_region_ignore_insert(region); + + IgnoredHeapRegion region; + region.block = message.block; + region.fragment = message.fragment; + region.address = message.address; + region.size = message.size; + process().ignore_heap(region); break; } @@ -215,7 +220,7 @@ bool ModelChecker::handle_message(char* buffer, ssize_t size) if (size != sizeof(message)) xbt_die("Broken messsage"); memcpy(&message, buffer, sizeof(message)); - MC_heap_region_ignore_remove( + process().unignore_heap( (void *)(std::uintptr_t) message.addr, message.size); break; } @@ -236,9 +241,7 @@ bool ModelChecker::handle_message(char* buffer, ssize_t size) if (size != sizeof(message)) xbt_die("Broken messsage"); memcpy(&message, buffer, sizeof(message)); - stack_region_t stack_region = xbt_new(s_stack_region_t, 1); - *stack_region = message.stack_region; - MC_stack_area_add(stack_region); + this->process().stack_areas().push_back(message.stack_region); } break; @@ -252,13 +255,13 @@ bool ModelChecker::handle_message(char* buffer, ssize_t size) xbt_die("Support for client-side function proposition is not implemented."); XBT_DEBUG("Received symbol: %s", message.name); - if (_mc_property_automaton == nullptr) - _mc_property_automaton = xbt_automaton_new(); + if (simgrid::mc::property_automaton == nullptr) + simgrid::mc::property_automaton = xbt_automaton_new(); simgrid::mc::Process* process = &this->process(); - simgrid::mc::remote_ptr address + simgrid::mc::RemotePtr address = simgrid::mc::remote((int*) message.data); - simgrid::xbt::add_proposition(_mc_property_automaton, + simgrid::xbt::add_proposition(simgrid::mc::property_automaton, message.name, [process, address]() { return process->read(address); } ); @@ -271,7 +274,7 @@ bool ModelChecker::handle_message(char* buffer, ssize_t size) case MC_MESSAGE_ASSERTION_FAILED: MC_report_assertion_error(); - ::exit(SIMGRID_MC_EXIT_SAFETY); + this->exit(SIMGRID_MC_EXIT_SAFETY); break; default: @@ -281,6 +284,15 @@ bool ModelChecker::handle_message(char* buffer, ssize_t size) return true; } +/** Terminate the model-checker aplication */ +void ModelChecker::exit(int status) +{ + // TODO, terminate the model checker politely instead of exiting rudel + if (process().running()) + kill(process().pid(), SIGKILL); + ::exit(status); +} + bool ModelChecker::handle_events() { char buffer[MC_MESSAGE_LENGTH]; @@ -292,20 +304,19 @@ bool ModelChecker::handle_events() case EINTR: continue; default: - throw std::system_error(errno, std::system_category()); + throw simgrid::xbt::errno_error(errno); } } if (socket_pollfd->revents) { if (socket_pollfd->revents & POLLIN) { - ssize_t size = MC_receive_message(socket_pollfd->fd, buffer, sizeof(buffer), MSG_DONTWAIT); + ssize_t size = process_->getChannel().receive(buffer, sizeof(buffer), false); if (size == -1 && errno != EAGAIN) - throw std::system_error(errno, std::system_category()); + throw simgrid::xbt::errno_error(errno); return handle_message(buffer, size); } - if (socket_pollfd->revents & POLLERR) { + if (socket_pollfd->revents & POLLERR) throw_socket_error(socket_pollfd->fd); - } if (socket_pollfd->revents & POLLHUP) xbt_die("Socket hang up?"); } @@ -315,9 +326,8 @@ bool ModelChecker::handle_events() this->handle_signals(); return true; } - if (signalfd_pollfd->revents & POLLERR) { + if (signalfd_pollfd->revents & POLLERR) throw_socket_error(signalfd_pollfd->fd); - } if (signalfd_pollfd->revents & POLLHUP) xbt_die("Signalfd hang up?"); } @@ -341,7 +351,7 @@ void ModelChecker::handle_signals() if (errno == EINTR) continue; else - throw std::system_error(errno, std::system_category()); + throw simgrid::xbt::errno_error(errno); } else if (size != sizeof(info)) return throw std::runtime_error( "Bad communication with model-checked application"); @@ -366,7 +376,7 @@ void ModelChecker::handle_waitpid() break; } else { XBT_ERROR("Could not wait for pid"); - throw std::system_error(errno, std::system_category()); + throw simgrid::xbt::errno_error(errno); } } @@ -374,18 +384,18 @@ void ModelChecker::handle_waitpid() // From PTRACE_O_TRACEEXIT: if (status>>8 == (SIGTRAP | (PTRACE_EVENT_EXIT<<8))) { - if (ptrace(PTRACE_GETEVENTMSG, pid_, 0, &status) == -1) + if (ptrace(PTRACE_GETEVENTMSG, this->process().pid(), 0, &status) == -1) xbt_die("Could not get exit status"); if (WIFSIGNALED(status)) { MC_report_crash(status); - ::exit(SIMGRID_MC_EXIT_PROGRAM_CRASH); + mc_model_checker->exit(SIMGRID_MC_EXIT_PROGRAM_CRASH); } } // We don't care about signals, just reinject them: if (WIFSTOPPED(status)) { XBT_DEBUG("Stopped with signal %i", (int) WSTOPSIG(status)); - if (ptrace(PTRACE_CONT, pid_, 0, WSTOPSIG(status)) == -1) + if (ptrace(PTRACE_CONT, this->process().pid(), 0, WSTOPSIG(status)) == -1) xbt_die("Could not PTRACE_CONT"); } @@ -411,10 +421,9 @@ void ModelChecker::on_signal(const struct signalfd_siginfo* info) void ModelChecker::wait_client(simgrid::mc::Process& process) { this->resume(process); - while (this->process().running()) { + while (this->process().running()) if (!this->handle_events()) return; - } } void ModelChecker::simcall_handle(simgrid::mc::Process& process, unsigned long pid, int value) @@ -424,12 +433,11 @@ void ModelChecker::simcall_handle(simgrid::mc::Process& process, unsigned long p m.type = MC_MESSAGE_SIMCALL_HANDLE; m.pid = pid; m.value = value; - process.send_message(m); - process.cache_flags = (mc_process_cache_flags_t) 0; - while (process.running()) { + process.getChannel().send(m); + process.clear_cache(); + while (process.running()) if (!this->handle_events()) return; - } } }