X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d807ae338c20b6dae20c353a3bfa489aff3f755b..90b0fa923c841996f89a17c252a443a65493fbfc:/src/mc/checker/SafetyChecker.cpp diff --git a/src/mc/checker/SafetyChecker.cpp b/src/mc/checker/SafetyChecker.cpp index 8fd5f95eae..3713b9378b 100644 --- a/src/mc/checker/SafetyChecker.cpp +++ b/src/mc/checker/SafetyChecker.cpp @@ -6,11 +6,11 @@ #include "src/mc/checker/SafetyChecker.hpp" #include "src/mc/Session.hpp" #include "src/mc/VisitedState.hpp" -#include "src/mc/api/Transition.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/transition/Transition.hpp" #include "src/xbt/mmalloc/mmprivate.h" #include "xbt/log.h" @@ -30,6 +30,18 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_safety, mc, "Logging specific to MC safety ve namespace simgrid { namespace mc { +xbt::signal SafetyChecker::on_exploration_start_signal; +xbt::signal SafetyChecker::on_backtracking_signal; + +xbt::signal SafetyChecker::on_state_creation_signal; + +xbt::signal SafetyChecker::on_restore_system_state_signal; +xbt::signal SafetyChecker::on_restore_initial_state_signal; +xbt::signal SafetyChecker::on_transition_replay_signal; +xbt::signal SafetyChecker::on_transition_execute_signal; + +xbt::signal SafetyChecker::on_log_state_signal; + void SafetyChecker::check_non_termination(const State* current_state) { for (auto state = stack_.rbegin(); state != stack_.rend(); ++state) @@ -41,7 +53,7 @@ void SafetyChecker::check_non_termination(const State* current_state) XBT_INFO("Counter-example execution trace:"); for (auto const& s : get_textual_trace()) XBT_INFO(" %s", s.c_str()); - simgrid::mc::dumpRecordPath(); + XBT_INFO("Path = %s", get_record_trace().to_string().c_str()); api::get().log_state(); throw TerminationError(); @@ -66,13 +78,16 @@ std::vector SafetyChecker::get_textual_trace() // override void SafetyChecker::log_state() // override { - XBT_INFO("Expanded states = %ld", State::get_expanded_states()); - XBT_INFO("Visited states = %lu", api::get().mc_get_visited_states()); - XBT_INFO("Executed transitions = %lu", Transition::get_executed_transitions()); + on_log_state_signal(); + XBT_INFO("DFS exploration ended. %ld unique states visited; %ld backtracks (%lu transition replays, %lu states " + "visited overall)", + State::get_expanded_states(), backtrack_count_, api::get().mc_get_visited_states(), + Transition::get_replayed_transitions()); } void SafetyChecker::run() { + on_exploration_start_signal(); /* This function runs the DFS algorithm the state space. * We do so iteratively instead of recursively, dealing with the call stack manually. * This allows one to explore the call stack at will. */ @@ -113,7 +128,6 @@ void SafetyChecker::run() int next = state->next_transition(); if (next < 0) { // If there is no more transition in the current state, backtrack. - XBT_DEBUG("There remains %zu actors, but none to interleave (depth %zu).", mc_model_checker->get_remote_process().actors().size(), stack_.size() + 1); @@ -123,20 +137,21 @@ void SafetyChecker::run() continue; } - /* Actually answer the request: let execute the selected request (MCed does one step) */ - state->set_transition(state->execute_next(next)); + /* Actually answer the request: let's execute the selected request (MCed does one step) */ + state->execute_next(next); + on_transition_execute_signal(state->get_transition()); // 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", state->get_transition()->to_cstring()); + XBT_DEBUG("Execute: %s", state->get_transition()->to_string().c_str()); std::string req_str; if (dot_output != nullptr) - req_str = - api::get().request_get_dot_output(state->get_transition()->aid_, state->get_transition()->times_considered_); + req_str = api::get().request_get_dot_output(state->get_transition()); /* Create the new expanded state (copy the state of MCed into our MCer data) */ - auto next_state = std::make_unique(); + auto next_state = std::make_unique(); + on_state_creation_signal(next_state.get()); if (_sg_mc_termination) this->check_non_termination(next_state.get()); @@ -169,12 +184,14 @@ void SafetyChecker::run() stack_.push_back(std::move(next_state)); } - XBT_INFO("No property violation found."); api::get().log_state(); } void SafetyChecker::backtrack() { + backtrack_count_++; + XBT_VERB("Backtracking from %s", get_record_trace().to_string().c_str()); + on_backtracking_signal(); stack_.pop_back(); api::get().mc_check_deadlock(); @@ -192,13 +209,13 @@ void SafetyChecker::backtrack() for (auto i = stack_.rbegin(); i != stack_.rend(); ++i) { State* prev_state = i->get(); if (state->get_transition()->aid_ == prev_state->get_transition()->aid_) { - XBT_DEBUG("Simcall >>%s<< and >>%s<< with same issuer %ld", state->get_transition()->to_cstring(), - prev_state->get_transition()->to_cstring(), issuer_id); + XBT_DEBUG("Simcall >>%s<< and >>%s<< with same issuer %ld", state->get_transition()->to_string().c_str(), + prev_state->get_transition()->to_string().c_str(), issuer_id); break; } else if (prev_state->get_transition()->depends(state->get_transition())) { XBT_VERB("Dependent Transitions:"); - XBT_VERB(" %s (state=%ld)", prev_state->get_transition()->to_cstring(), prev_state->num_); - XBT_VERB(" %s (state=%ld)", state->get_transition()->to_cstring(), state->num_); + XBT_VERB(" %s (state=%ld)", prev_state->get_transition()->to_string().c_str(), prev_state->num_); + XBT_VERB(" %s (state=%ld)", state->get_transition()->to_string().c_str(), state->num_); if (not prev_state->actor_states_[issuer_id].is_done()) prev_state->mark_todo(issuer_id); @@ -207,8 +224,8 @@ void SafetyChecker::backtrack() break; } else { XBT_VERB("INDEPENDENT Transitions:"); - XBT_VERB(" %s (state=%ld)", prev_state->get_transition()->to_cstring(), prev_state->num_); - XBT_VERB(" %s (state=%ld)", state->get_transition()->to_cstring(), state->num_); + XBT_VERB(" %s (state=%ld)", prev_state->get_transition()->to_string().c_str(), prev_state->num_); + XBT_VERB(" %s (state=%ld)", state->get_transition()->to_string().c_str(), state->num_); } } } @@ -228,20 +245,24 @@ void SafetyChecker::backtrack() void SafetyChecker::restore_state() { - /* Intermediate backtracking */ - const State* last_state = stack_.back().get(); + /* If asked to rollback on a state that has a snapshot, restore it */ + State* last_state = stack_.back().get(); if (last_state->system_state_) { api::get().restore_state(last_state->system_state_); + on_restore_system_state_signal(last_state); return; } + /* if no snapshot, we need to restore the initial state and replay the transitions */ get_session().restore_initial_state(); + on_restore_initial_state_signal(); /* Traverse the stack from the state at position start and re-execute the transitions */ for (std::unique_ptr const& state : stack_) { - if (state == stack_.back()) + if (state == stack_.back()) // If we are arrived on the target state, don't replay the outgoing transition *. break; state->get_transition()->replay(); + on_transition_replay_signal(state->get_transition()); /* Update statistics */ api::get().mc_inc_visited_states(); } @@ -258,7 +279,7 @@ SafetyChecker::SafetyChecker(Session* session) : Checker(session) if (_sg_mc_termination) XBT_INFO("Check non progressive cycles"); else - XBT_INFO("Check a safety property. Reduction is: %s.", + XBT_INFO("Start a DFS exploration. Reduction is: %s.", (reductionMode_ == ReductionMode::none ? "none" : (reductionMode_ == ReductionMode::dpor ? "dpor" : "unknown")));