X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/67592b097ee1e3d2bc4c1e79d8401732d8d6f869..9692d43fa911bdc2d6d0263a3cb3e22d5e3167fe:/src/mc/SafetyChecker.cpp diff --git a/src/mc/SafetyChecker.cpp b/src/mc/SafetyChecker.cpp index 8055c65b60..0c8d7aff95 100644 --- a/src/mc/SafetyChecker.cpp +++ b/src/mc/SafetyChecker.cpp @@ -25,6 +25,8 @@ #include "src/mc/Checker.hpp" #include "src/mc/SafetyChecker.hpp" #include "src/mc/VisitedState.hpp" +#include "src/mc/Transition.hpp" +#include "src/mc/Session.hpp" #include "src/xbt/mmalloc/mmprivate.h" @@ -41,7 +43,7 @@ static void MC_show_non_termination(void) XBT_INFO("Counter-example execution trace:"); for (auto& s : mc_model_checker->getChecker()->getTextualTrace()) XBT_INFO("%s", s.c_str()); - MC_print_statistics(mc_stats); + simgrid::mc::session->logState(); } static int snapshot_compare(simgrid::mc::State* state1, simgrid::mc::State* state2) @@ -68,7 +70,7 @@ RecordTrace SafetyChecker::getRecordTrace() // override { RecordTrace res; for (auto const& state : stack_) - res.push_back(state->getRecordElement()); + res.push_back(state->getTransition()); return res; } @@ -76,7 +78,7 @@ std::vector SafetyChecker::getTextualTrace() // override { std::vector trace; for (auto const& state : stack_) { - int value = state->req_num; + int value = state->transition.argument; smx_simcall_t req = &state->executed_req; if (req) trace.push_back(simgrid::mc::request_to_string( @@ -85,6 +87,14 @@ std::vector SafetyChecker::getTextualTrace() // override return trace; } +void SafetyChecker::logState() // override +{ + Checker::logState(); + XBT_INFO("Expanded states = %lu", expandedStatesCount_); + XBT_INFO("Visited states = %lu", mc_model_checker->visited_states); + XBT_INFO("Executed transitions = %lu", mc_model_checker->executed_transitions); +} + int SafetyChecker::run() { this->init(); @@ -100,7 +110,7 @@ int SafetyChecker::run() stack_.size(), state, state->num, state->interleaveSize()); - mc_stats->visited_states++; + mc_model_checker->visited_states++; // The interleave set is empty or the maximum depth is reached, // let's back-track. @@ -115,30 +125,24 @@ int SafetyChecker::run() continue; } - int req_num = state->req_num; - // 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", simgrid::mc::request_to_string( - req, req_num, simgrid::mc::RequestType::simix).c_str()); + req, state->transition.argument, simgrid::mc::RequestType::simix).c_str()); std::string req_str; if (dot_output != nullptr) - req_str = simgrid::mc::request_get_dot_output(req, req_num); - - mc_stats->executed_transitions++; + req_str = simgrid::mc::request_get_dot_output(req, state->transition.argument); - // TODO, bundle both operations in a single message - // MC_execute_transition(req, req_num) + mc_model_checker->executed_transitions++; /* Answer the request */ - simgrid::mc::handle_simcall(req, req_num); - mc_model_checker->wait_for_requests(); + this->getSession().execute(state->transition); /* Create the new expanded state */ std::unique_ptr next_state = - std::unique_ptr(MC_state_new()); + std::unique_ptr(MC_state_new(++expandedStatesCount_)); if (_sg_mc_termination && this->checkNonTermination(next_state.get())) { MC_show_non_termination(); @@ -146,12 +150,12 @@ int SafetyChecker::run() } if (_sg_mc_visited == 0 - || (visitedState_ = visitedStates_.addVisitedState(next_state.get(), true)) == nullptr) { + || (visitedState_ = visitedStates_.addVisitedState(expandedStatesCount_, next_state.get(), true)) == nullptr) { /* Get an enabled process and insert it in the interleave set of the next state */ for (auto& p : mc_model_checker->process().simix_processes()) - if (simgrid::mc::process_is_enabled(&p.copy)) { - next_state->interleave(&p.copy); + if (simgrid::mc::process_is_enabled(p.copy.getBuffer())) { + next_state->interleave(p.copy.getBuffer()); if (reductionMode_ != simgrid::mc::ReductionMode::none) break; } @@ -169,8 +173,7 @@ int SafetyChecker::run() } XBT_INFO("No property violation found."); - MC_print_statistics(mc_stats); - initial_global_state = nullptr; + simgrid::mc::session->logState(); return SIMGRID_MC_EXIT_SUCCESS; } @@ -213,20 +216,20 @@ int SafetyChecker::backtrack() if (req->call == SIMCALL_MUTEX_LOCK || req->call == SIMCALL_MUTEX_TRYLOCK) xbt_die("Mutex is currently not supported with DPOR, " "use --cfg=model-check/reduction:none"); - const smx_process_t issuer = MC_smx_simcall_get_issuer(req); + const smx_actor_t issuer = MC_smx_simcall_get_issuer(req); for (auto i = stack_.rbegin(); i != stack_.rend(); ++i) { simgrid::mc::State* prev_state = i->get(); if (reductionMode_ != simgrid::mc::ReductionMode::none && simgrid::mc::request_depend(req, &prev_state->internal_req)) { if (XBT_LOG_ISENABLED(mc_safety, xbt_log_priority_debug)) { XBT_DEBUG("Dependent Transitions:"); - int value = prev_state->req_num; + int value = prev_state->transition.argument; smx_simcall_t prev_req = &prev_state->executed_req; XBT_DEBUG("%s (state=%d)", simgrid::mc::request_to_string( prev_req, value, simgrid::mc::RequestType::internal).c_str(), prev_state->num); - value = state->req_num; + value = state->transition.argument; prev_req = &state->executed_req; XBT_DEBUG("%s (state=%d)", simgrid::mc::request_to_string( @@ -248,7 +251,7 @@ int SafetyChecker::backtrack() } else { - const smx_process_t previous_issuer = MC_smx_simcall_get_issuer(&prev_state->internal_req); + const smx_actor_t previous_issuer = MC_smx_simcall_get_issuer(&prev_state->internal_req); XBT_DEBUG("Simcall %d, process %lu (state %d) and simcall %d, process %lu (state %d) are independant", req->call, issuer->pid, state->num, prev_state->internal_req.call, @@ -265,7 +268,7 @@ int SafetyChecker::backtrack() XBT_DEBUG("Back-tracking to state %d at depth %zi", state->num, stack_.size() + 1); stack_.push_back(std::move(state)); - simgrid::mc::replay(stack_); + this->restoreState(); XBT_DEBUG("Back-tracking to state %d at depth %zi done", stack_.back()->num, stack_.size()); break; @@ -277,6 +280,31 @@ int SafetyChecker::backtrack() return SIMGRID_MC_EXIT_SUCCESS; } +void SafetyChecker::restoreState() +{ + /* Intermediate backtracking */ + { + simgrid::mc::State* state = stack_.back().get(); + if (state->system_state) { + simgrid::mc::restore_snapshot(state->system_state); + return; + } + } + + /* Restore the initial state */ + simgrid::mc::session->restoreInitialState(); + + /* 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()) + break; + session->execute(state->transition); + /* Update statistics */ + mc_model_checker->visited_states++; + mc_model_checker->executed_transitions++; + } +} + void SafetyChecker::init() { reductionMode_ = simgrid::mc::reduction_mode; @@ -289,32 +317,25 @@ void SafetyChecker::init() XBT_INFO("Check non progressive cycles"); else XBT_INFO("Check a safety property"); - mc_model_checker->wait_for_requests(); + simgrid::mc::session->initialize(); XBT_DEBUG("Starting the safety algorithm"); std::unique_ptr initial_state = - std::unique_ptr(MC_state_new()); + std::unique_ptr(MC_state_new(++expandedStatesCount_)); XBT_DEBUG("**************************************************"); XBT_DEBUG("Initial state"); - /* Wait for requests (schedules processes) */ - mc_model_checker->wait_for_requests(); - /* Get an enabled process and insert it in the interleave set of the initial state */ for (auto& p : mc_model_checker->process().simix_processes()) - if (simgrid::mc::process_is_enabled(&p.copy)) { - initial_state->interleave(&p.copy); + if (simgrid::mc::process_is_enabled(p.copy.getBuffer())) { + initial_state->interleave(p.copy.getBuffer()); if (reductionMode_ != simgrid::mc::ReductionMode::none) break; } stack_.push_back(std::move(initial_state)); - - /* Save the initial state */ - initial_global_state = std::unique_ptr(new s_mc_global_t()); - initial_global_state->snapshot = simgrid::mc::take_snapshot(0); } SafetyChecker::SafetyChecker(Session& session) : Checker(session)