X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dccf1b41e9c7b5a696f01abceaa2779fe65f154f..22cae46149e1fb4988ad9e46060c3e7ecd4e0e44:/src/mc/ModelChecker.cpp?ds=sidebyside diff --git a/src/mc/ModelChecker.cpp b/src/mc/ModelChecker.cpp index 5d0e4af050..1a4f7028ff 100644 --- a/src/mc/ModelChecker.cpp +++ b/src/mc/ModelChecker.cpp @@ -6,17 +6,15 @@ #include -#include #include #include #include -#include #include #include #include -#include +#include "xbt/log.h" #include #include #include @@ -24,15 +22,14 @@ #include "simgrid/sg_config.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/PageStore.hpp" +#include "src/mc/Transition.hpp" +#include "src/mc/checker/Checker.hpp" #include "src/mc/mc_exit.h" +#include "src/mc/mc_private.h" #include "src/mc/mc_record.h" -#include "src/mc/Transition.hpp" -#include "src/mc/Checker.hpp" +#include "src/mc/remote/mc_protocol.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_ModelChecker, mc, "ModelChecker"); @@ -40,14 +37,19 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_ModelChecker, mc, "ModelChecker"); using simgrid::mc::remote; -// Hardcoded index for now: -#define SOCKET_FD_INDEX 0 -#define SIGNAL_FD_INDEX 1 +#ifdef __linux__ +# define WAITPID_CHECKED_FLAGS __WALL +#else +# define WAITPID_CHECKED_FLAGS 0 +#endif namespace simgrid { namespace mc { ModelChecker::ModelChecker(std::unique_ptr process) : + base_(nullptr), + socket_event_(nullptr), + signal_event_(nullptr), page_store_(500), process_(std::move(process)), parent_snapshot_(nullptr) @@ -55,44 +57,41 @@ ModelChecker::ModelChecker(std::unique_ptr process) : } -ModelChecker::~ModelChecker() {} +ModelChecker::~ModelChecker() { + if (socket_event_ != nullptr) + event_free(socket_event_); + if (signal_event_ != nullptr) + event_free(signal_event_); + if (base_ != nullptr) + event_base_free(base_); +} 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 simgrid::xbt::errno_error(); - - sigset_t full_set; - sigfillset(&full_set); - - // Prepare data for poll: - - struct pollfd* socket_pollfd = &fds_[SOCKET_FD_INDEX]; - 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 simgrid::xbt::errno_error(); - - struct pollfd* signalfd_pollfd = &fds_[SIGNAL_FD_INDEX]; - signalfd_pollfd->fd = signal_fd; - signalfd_pollfd->events = POLLIN; - signalfd_pollfd->revents = 0; + base_ = event_base_new(); + event_callback_fn event_callback = [](evutil_socket_t fd, short events, void *arg) + { + ((ModelChecker *)arg)->handle_events(fd, events); + }; + socket_event_ = event_new(base_, + process_->getChannel().getSocket(), + EV_READ|EV_PERSIST, + event_callback, this); + event_add(socket_event_, NULL); + signal_event_ = event_new(base_, + SIGCHLD, + EV_SIGNAL|EV_PERSIST, + event_callback, this); + event_add(signal_event_, NULL); XBT_DEBUG("Waiting for the model-checked process"); int status; // The model-checked process SIGSTOP itself to signal it's ready: - pid_t res = waitpid(pid, &status, __WALL); - if (res < 0 || !WIFSTOPPED(status) || WSTOPSIG(status) != SIGSTOP) + 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"); process_->init(); @@ -102,8 +101,14 @@ void ModelChecker::start() setup_ignore(); +#ifdef __linux__ ptrace(PTRACE_SETOPTIONS, pid, nullptr, PTRACE_O_TRACEEXIT); ptrace(PTRACE_CONT, pid, 0, 0); +#elif defined BSD + ptrace(PT_CONTINUE, pid, (caddr_t)1, 0); +#else +# error "no ptrace equivalent coded for this platform" +#endif } static const std::pair ignored_local_variables[] = { @@ -155,16 +160,6 @@ void ModelChecker::resume(simgrid::mc::Process& process) process.clear_cache(); } -static -void throw_socket_error(int fd) -{ - int error = 0; - socklen_t errlen = sizeof(error); - if (getsockopt(fd, SOL_SOCKET, SO_ERROR, (void *)&error, &errlen) == -1) - error = errno; - throw simgrid::xbt::errno_error(); -} - static void MC_report_crash(int status) { XBT_INFO("**************************"); @@ -187,7 +182,7 @@ static void MC_report_crash(int status) mc_model_checker->process().dumpStack(); } -static void MC_report_assertion_error(void) +static void MC_report_assertion_error() { XBT_INFO("**************************"); XBT_INFO("*** PROPERTY NOT VALID ***"); @@ -303,72 +298,29 @@ void ModelChecker::exit(int status) ::exit(status); } -bool ModelChecker::handle_events() +void ModelChecker::handle_events(int fd, short events) { - char buffer[MC_MESSAGE_LENGTH]; - struct pollfd* socket_pollfd = &fds_[SOCKET_FD_INDEX]; - struct pollfd* signalfd_pollfd = &fds_[SIGNAL_FD_INDEX]; - - while(poll(fds_, 2, -1) == -1) { - switch(errno) { - case EINTR: - continue; - default: + if (events == EV_READ) { + char buffer[MC_MESSAGE_LENGTH]; + ssize_t size = process_->getChannel().receive(buffer, sizeof(buffer), false); + if (size == -1 && errno != EAGAIN) throw simgrid::xbt::errno_error(); + if (not handle_message(buffer, size)) { + event_base_loopbreak(base_); } } - - if (socket_pollfd->revents) { - if (socket_pollfd->revents & POLLIN) { - ssize_t size = process_->getChannel().receive(buffer, sizeof(buffer), false); - if (size == -1 && errno != EAGAIN) - throw simgrid::xbt::errno_error(); - return handle_message(buffer, size); - } - if (socket_pollfd->revents & POLLERR) - throw_socket_error(socket_pollfd->fd); - if (socket_pollfd->revents & POLLHUP) - xbt_die("Socket hang up?"); + else if (events == EV_SIGNAL) { + on_signal(fd); } - - if (signalfd_pollfd->revents) { - if (signalfd_pollfd->revents & POLLIN) { - this->handle_signals(); - return true; - } - if (signalfd_pollfd->revents & POLLERR) - throw_socket_error(signalfd_pollfd->fd); - if (signalfd_pollfd->revents & POLLHUP) - xbt_die("Signalfd hang up?"); + else { + xbt_die("Unexpected event"); } - - return true; } void ModelChecker::loop() { - while (this->process().running()) - this->handle_events(); -} - -void ModelChecker::handle_signals() -{ - struct signalfd_siginfo info; - struct pollfd* signalfd_pollfd = &fds_[SIGNAL_FD_INDEX]; - while (1) { - ssize_t size = read(signalfd_pollfd->fd, &info, sizeof(info)); - if (size == -1) { - if (errno == EINTR) - continue; - else - throw simgrid::xbt::errno_error(); - } else if (size != sizeof(info)) - return throw std::runtime_error( - "Bad communication with model-checked application"); - else - break; - } - this->on_signal(&info); + if (this->process().running()) + event_base_dispatch(base_); } void ModelChecker::handle_waitpid() @@ -393,6 +345,7 @@ void ModelChecker::handle_waitpid() if (pid == this->process().pid()) { // From PTRACE_O_TRACEEXIT: +#ifdef __linux__ if (status>>8 == (SIGTRAP | (PTRACE_EVENT_EXIT<<8))) { if (ptrace(PTRACE_GETEVENTMSG, this->process().pid(), 0, &status) == -1) xbt_die("Could not get exit status"); @@ -401,11 +354,18 @@ void ModelChecker::handle_waitpid() mc_model_checker->exit(SIMGRID_MC_EXIT_PROGRAM_CRASH); } } +#endif // 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, this->process().pid(), 0, WSTOPSIG(status)) == -1) + errno = 0; +#ifdef __linux__ + ptrace(PTRACE_CONT, this->process().pid(), 0, WSTOPSIG(status)); +#elif defined BSD + ptrace(PT_CONTINUE, this->process().pid(), (caddr_t)1, WSTOPSIG(status)); +#endif + if (errno != 0) xbt_die("Could not PTRACE_CONT"); } @@ -417,9 +377,9 @@ void ModelChecker::handle_waitpid() } } -void ModelChecker::on_signal(const struct signalfd_siginfo* info) +void ModelChecker::on_signal(int signo) { - switch(info->ssi_signo) { + switch(signo) { case SIGCHLD: this->handle_waitpid(); break; @@ -431,9 +391,8 @@ void ModelChecker::on_signal(const struct signalfd_siginfo* info) void ModelChecker::wait_client(simgrid::mc::Process& process) { this->resume(process); - while (this->process().running()) - if (!this->handle_events()) - return; + if (this->process().running()) + event_base_dispatch(base_); } void ModelChecker::handle_simcall(Transition const& transition) @@ -445,9 +404,8 @@ void ModelChecker::handle_simcall(Transition const& transition) m.value = transition.argument; this->process_->getChannel().send(m); this->process_->clear_cache(); - while (this->process_->running()) - if (!this->handle_events()) - return; + if (this->process_->running()) + event_base_dispatch(base_); } bool ModelChecker::checkDeadlock()