X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/82fafbab5f8ce1530037fd245d678e917119caa0..d89ca681772fdaafdd69049d4d66676a4e98de38:/src/mc/checker/SafetyChecker.cpp diff --git a/src/mc/checker/SafetyChecker.cpp b/src/mc/checker/SafetyChecker.cpp index c54759cd74..edabda4cbb 100644 --- a/src/mc/checker/SafetyChecker.cpp +++ b/src/mc/checker/SafetyChecker.cpp @@ -1,18 +1,9 @@ -/* Copyright (c) 2016-2021. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2016-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 -#include - -#include -#include -#include - -#include -#include - +#include "src/mc/Session.hpp" #include "src/mc/Transition.hpp" #include "src/mc/VisitedState.hpp" #include "src/mc/checker/SafetyChecker.hpp" @@ -20,9 +11,17 @@ #include "src/mc/mc_exit.hpp" #include "src/mc/mc_private.hpp" #include "src/mc/mc_record.hpp" -#include "src/mc/mc_request.hpp" #include "src/xbt/mmalloc/mmprivate.h" +#include "xbt/log.h" +#include "xbt/sysdep.h" + +#include +#include + +#include +#include +#include using api = simgrid::mc::Api; @@ -40,8 +39,7 @@ void SafetyChecker::check_non_termination(const State* current_state) XBT_INFO("*** NON-PROGRESSIVE CYCLE DETECTED ***"); XBT_INFO("******************************************"); XBT_INFO("Counter-example execution trace:"); - auto checker = api::get().mc_get_checker(); - for (auto const& s : checker->get_textual_trace()) + for (auto const& s : get_textual_trace()) XBT_INFO(" %s", s.c_str()); api::get().dump_record_path(); api::get().log_state(); @@ -91,7 +89,12 @@ void SafetyChecker::run() // Backtrack if we reached the maximum depth if (stack_.size() > (std::size_t)_sg_mc_max_depth) { - XBT_WARN("/!\\ Max depth reached ! /!\\ "); + if (reductionMode_ == ReductionMode::dpor) { + XBT_ERROR("/!\\ Max depth of %d reached! THIS WILL PROBABLY BREAK the dpor reduction /!\\", + _sg_mc_max_depth.get()); + XBT_ERROR("/!\\ If bad things happen, disable dpor with --cfg=model-check/reduction:none /!\\"); + } else + XBT_WARN("/!\\ Max depth reached ! /!\\ "); this->backtrack(); continue; } @@ -112,16 +115,18 @@ void SafetyChecker::run() // req is now the transition of the process that was selected to be executed if (req == nullptr) { - XBT_DEBUG("There are no more processes to interleave. (depth %zu)", stack_.size() + 1); + XBT_DEBUG("There remains %zu actors, but none to interleave (depth %zu).", + mc_model_checker->get_remote_process().actors().size(), stack_.size() + 1); + if (mc_model_checker->get_remote_process().actors().empty()) + mc_model_checker->finalize_app(); this->backtrack(); continue; } // If there are processes to interleave and the maximum depth has not been // reached then perform one step of the exploration algorithm. - XBT_DEBUG("Execute: %s", - api::get().request_to_string(req, state->transition_.times_considered_, RequestType::simix).c_str()); + XBT_DEBUG("Execute: %s", api::get().request_to_string(req, state->transition_.times_considered_).c_str()); std::string req_str; if (dot_output != nullptr) @@ -130,11 +135,13 @@ void SafetyChecker::run() api::get().mc_inc_executed_trans(); /* Actually answer the request: let execute the selected request (MCed does one step) */ - api::get().execute(state->transition_, &state->executed_req_); + RemotePtr remote_observer = + api::get().execute(state->transition_, &state->executed_req_); /* Create the new expanded state (copy the state of MCed into our MCer data) */ ++expanded_states_count_; auto next_state = std::make_unique(expanded_states_count_); + next_state->remote_observer_ = remote_observer; if (_sg_mc_termination) this->check_non_termination(next_state.get()); @@ -146,10 +153,10 @@ void SafetyChecker::run() /* If this is a new state (or if we don't care about state-equality reduction) */ if (visited_state_ == nullptr) { /* Get an enabled process and insert it in the interleave set of the next state */ - auto actors = api::get().get_actors(); + auto actors = api::get().get_actors(); for (auto& remoteActor : actors) { auto actor = remoteActor.copy.get_buffer(); - if (api::get().actor_is_enabled(actor->get_pid())) { + if (get_session().actor_is_enabled(actor->get_pid())) { next_state->mark_todo(actor); if (reductionMode_ == ReductionMode::dpor) break; // With DPOR, we take the first enabled transition @@ -186,43 +193,34 @@ void SafetyChecker::backtrack() std::unique_ptr state = std::move(stack_.back()); stack_.pop_back(); if (reductionMode_ == ReductionMode::dpor) { - smx_simcall_t req = &state->internal_req_; - // FIXME: need something less ugly than this substring search - if (req->call_ == simix::Simcall::MUTEX_LOCK || - (req->observer_ && - api::get().request_to_string(req, 0, RequestType::internal).find("Mutex") != std::string::npos)) - xbt_die("Mutex is currently not supported with DPOR, use --cfg=model-check/reduction:none"); - - const kernel::actor::ActorImpl* issuer = api::get().simcall_get_issuer(req); + kernel::actor::ActorImpl* issuer = api::get().simcall_get_issuer(&state->executed_req_); for (auto i = stack_.rbegin(); i != stack_.rend(); ++i) { State* prev_state = i->get(); - if (api::get().simcall_check_dependency(req, &prev_state->internal_req_)) { + if (state->executed_req_.issuer_ == prev_state->executed_req_.issuer_) { + XBT_DEBUG("Simcall %s and %s with same issuer", SIMIX_simcall_name(state->executed_req_), + SIMIX_simcall_name(prev_state->executed_req_)); + break; + } else if (api::get().requests_are_dependent(state->remote_observer_, state->remote_observer_)) { if (XBT_LOG_ISENABLED(mc_safety, xbt_log_priority_debug)) { XBT_DEBUG("Dependent Transitions:"); int value = prev_state->transition_.times_considered_; smx_simcall_t prev_req = &prev_state->executed_req_; - XBT_DEBUG("%s (state=%d)", api::get().request_to_string(prev_req, value, RequestType::internal).c_str(), - prev_state->num_); + XBT_DEBUG("%s (state=%d)", api::get().request_to_string(prev_req, value).c_str(), prev_state->num_); value = state->transition_.times_considered_; prev_req = &state->executed_req_; - XBT_DEBUG("%s (state=%d)", api::get().request_to_string(prev_req, value, RequestType::executed).c_str(), - state->num_); + XBT_DEBUG("%s (state=%d)", api::get().request_to_string(prev_req, value).c_str(), state->num_); } if (not prev_state->actor_states_[issuer->get_pid()].is_done()) prev_state->mark_todo(issuer); else - XBT_DEBUG("Process %p is in done set", req->issuer_); - break; - } else if (req->issuer_ == prev_state->internal_req_.issuer_) { - XBT_DEBUG("Simcall %s and %s with same issuer", SIMIX_simcall_name(req->call_), - SIMIX_simcall_name(prev_state->internal_req_.call_)); + XBT_DEBUG("Actor %s %ld is in done set", api::get().get_actor_name(issuer).c_str(), issuer->get_pid()); break; } else { - const kernel::actor::ActorImpl* previous_issuer = api::get().simcall_get_issuer(&prev_state->internal_req_); + const kernel::actor::ActorImpl* previous_issuer = api::get().simcall_get_issuer(&prev_state->executed_req_); XBT_DEBUG("Simcall %s, process %ld (state %d) and simcall %s, process %ld (state %d) are independent", - SIMIX_simcall_name(req->call_), issuer->get_pid(), state->num_, - SIMIX_simcall_name(prev_state->internal_req_.call_), previous_issuer->get_pid(), prev_state->num_); + SIMIX_simcall_name(state->executed_req_), issuer->get_pid(), state->num_, + SIMIX_simcall_name(prev_state->executed_req_), previous_issuer->get_pid(), prev_state->num_); } } } @@ -249,8 +247,7 @@ void SafetyChecker::restore_state() return; } - /* Restore the initial state */ - api::get().restore_initial_state(); + get_session().restore_initial_state(); /* Traverse the stack from the state at position start and re-execute the transitions */ for (std::unique_ptr const& state : stack_) { @@ -263,7 +260,7 @@ void SafetyChecker::restore_state() } } -SafetyChecker::SafetyChecker() : Checker() +SafetyChecker::SafetyChecker(Session* session) : Checker(session) { reductionMode_ = reduction_mode; if (_sg_mc_termination) @@ -277,8 +274,8 @@ SafetyChecker::SafetyChecker() : Checker() XBT_INFO("Check a safety property. Reduction is: %s.", (reductionMode_ == ReductionMode::none ? "none" : (reductionMode_ == ReductionMode::dpor ? "dpor" : "unknown"))); - - api::get().session_initialize(); + + get_session().take_initial_snapshot(); XBT_DEBUG("Starting the safety algorithm"); @@ -286,23 +283,26 @@ SafetyChecker::SafetyChecker() : Checker() auto initial_state = std::make_unique(expanded_states_count_); XBT_DEBUG("**************************************************"); - XBT_DEBUG("Initial state"); /* Get an enabled actor and insert it in the interleave set of the initial state */ auto actors = api::get().get_actors(); + XBT_DEBUG("Initial state. %zu actors to consider", actors.size()); for (auto& actor : actors) - if (api::get().actor_is_enabled(actor.copy.get_buffer()->get_pid())) { + if (get_session().actor_is_enabled(actor.copy.get_buffer()->get_pid())) { initial_state->mark_todo(actor.copy.get_buffer()); - if (reductionMode_ != ReductionMode::none) + if (reductionMode_ == ReductionMode::dpor) { + XBT_DEBUG("Actor %ld is TODO, DPOR is ON so let's go for this one.", actor.copy.get_buffer()->get_pid()); break; + } + XBT_DEBUG("Actor %ld is TODO", actor.copy.get_buffer()->get_pid()); } stack_.push_back(std::move(initial_state)); } -Checker* createSafetyChecker() +Checker* create_safety_checker(Session* session) { - return new SafetyChecker(); + return new SafetyChecker(session); } } // namespace mc