X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c5309c7efaf73d81f7aa8cb7908348d0db5677fe..f05224ef57c30ee1e71be443a160a236f7fe121a:/src/mc/SafetyChecker.cpp diff --git a/src/mc/SafetyChecker.cpp b/src/mc/SafetyChecker.cpp index 182ff28964..0a05e4a8e7 100644 --- a/src/mc/SafetyChecker.cpp +++ b/src/mc/SafetyChecker.cpp @@ -10,9 +10,6 @@ #include #include -#include -#include -#include #include #include "src/mc/mc_state.h" @@ -25,19 +22,12 @@ #include "src/mc/mc_exit.h" #include "src/mc/Checker.hpp" #include "src/mc/SafetyChecker.hpp" +#include "src/mc/VisitedState.hpp" #include "src/xbt/mmalloc/mmprivate.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_safety, mc, "Logging specific to MC safety verification "); - -/** Stack (of `simgrid::mc::State*`) representing the current position of the - * the MC in the exploration graph - * - * It is managed by its head (`xbt_fifo_shift` and `xbt_fifo_unshift`). - */ -XBT_PRIVATE static std::list mc_stack; - namespace simgrid { namespace mc { @@ -61,22 +51,23 @@ static int snapshot_compare(simgrid::mc::State* state1, simgrid::mc::State* stat return snapshot_compare(num1, s1, num2, s2); } -static int is_exploration_stack_state(simgrid::mc::State* current_state) +bool SafetyChecker::checkNonDeterminism(simgrid::mc::State* current_state) { - for (auto i = mc_stack.rbegin(); i != mc_stack.rend(); ++i) - if(snapshot_compare(*i, current_state) == 0){ - XBT_INFO("Non-progressive cycle : state %d -> state %d", (*i)->num, current_state->num); - return 1; + for (auto i = stack_.rbegin(); i != stack_.rend(); ++i) + if (snapshot_compare(i->get(), current_state) == 0){ + XBT_INFO("Non-progressive cycle : state %d -> state %d", + (*i)->num, current_state->num); + return true; } - return 0; + return false; } RecordTrace SafetyChecker::getRecordTrace() // override { RecordTrace res; - for (simgrid::mc::State* state : mc_stack) { + for (auto const& state : stack_) { int value = 0; - smx_simcall_t saved_req = MC_state_get_executed_request(state, &value); + smx_simcall_t saved_req = MC_state_get_executed_request(state.get(), &value); const smx_process_t issuer = MC_smx_simcall_get_issuer(saved_req); const int pid = issuer->pid; res.push_back(RecordTraceElement(pid, value)); @@ -87,9 +78,9 @@ RecordTrace SafetyChecker::getRecordTrace() // override std::vector SafetyChecker::getTextualTrace() // override { std::vector trace; - for (simgrid::mc::State* state : mc_stack) { + for (auto const& state : stack_) { int value; - smx_simcall_t req = MC_state_get_executed_request(state, &value); + smx_simcall_t req = MC_state_get_executed_request(state.get(), &value); if (req) { char* req_str = simgrid::mc::request_to_string( req, value, simgrid::mc::RequestType::executed); @@ -104,34 +95,30 @@ int SafetyChecker::run() { this->init(); - char *req_str = nullptr; int value; smx_simcall_t req = nullptr; - simgrid::mc::State* prev_state = nullptr; - simgrid::mc::State* next_state = nullptr; - xbt_fifo_item_t item = nullptr; std::unique_ptr visited_state = nullptr; - while (!mc_stack.empty()) { + while (!stack_.empty()) { /* Get current state */ - simgrid::mc::State* state = mc_stack.back(); + simgrid::mc::State* state = stack_.back().get(); XBT_DEBUG("**************************************************"); - XBT_DEBUG - ("Exploration depth=%zi (state=%p, num %d)(%u interleave, user_max_depth %d)", - mc_stack.size(), state, state->num, - MC_state_interleave_size(state), user_max_depth_reached); + XBT_DEBUG( + "Exploration depth=%zi (state=%p, num %d)(%u interleave, user_max_depth %d)", + stack_.size(), state, state->num, + MC_state_interleave_size(state), user_max_depth_reached); /* Update statistics */ mc_stats->visited_states++; /* If there are processes to interleave and the maximum depth has not been reached then perform one step of the exploration algorithm */ - if (mc_stack.size() <= _sg_mc_max_depth && !user_max_depth_reached + if (stack_.size() <= (std::size_t) _sg_mc_max_depth && !user_max_depth_reached && (req = MC_state_get_request(state, &value)) && visited_state == nullptr) { - req_str = simgrid::mc::request_to_string(req, value, simgrid::mc::RequestType::simix); + char* req_str = simgrid::mc::request_to_string(req, value, simgrid::mc::RequestType::simix); XBT_DEBUG("Execute: %s", req_str); xbt_free(req_str); @@ -149,19 +136,21 @@ int SafetyChecker::run() mc_model_checker->wait_for_requests(); /* Create the new expanded state */ - next_state = MC_state_new(); + std::unique_ptr next_state = + std::unique_ptr(MC_state_new()); - if(_sg_mc_termination && is_exploration_stack_state(next_state)){ + if (_sg_mc_termination && this->checkNonDeterminism(next_state.get())){ MC_show_non_termination(); return SIMGRID_MC_EXIT_NON_TERMINATION; } - if (_sg_mc_visited == 0 || (visited_state = simgrid::mc::is_visited_state(next_state, true)) == nullptr) { + if (_sg_mc_visited == 0 + || (visited_state = visitedStates_.addVisitedState(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)) { - MC_state_interleave_process(next_state, &p.copy); + MC_state_interleave_process(next_state.get(), &p.copy); if (reductionMode_ != simgrid::mc::ReductionMode::none) break; } @@ -172,7 +161,7 @@ int SafetyChecker::run() } else if (dot_output != nullptr) std::fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n", state->num, visited_state->other_num == -1 ? visited_state->num : visited_state->other_num, req_str); - mc_stack.push_back(next_state); + stack_.push_back(std::move(next_state)); if (dot_output != nullptr) xbt_free(req_str); @@ -182,7 +171,7 @@ int SafetyChecker::run() /* The interleave set is empty or the maximum depth is reached, let's back-track */ } else { - if (mc_stack.size() > _sg_mc_max_depth + if (stack_.size() > (std::size_t) _sg_mc_max_depth || user_max_depth_reached || visited_state != nullptr) { @@ -195,13 +184,11 @@ int SafetyChecker::run() } else XBT_DEBUG("There are no more processes to interleave. (depth %zi)", - mc_stack.size() + 1); + stack_.size() + 1); /* Trash the current state, no longer needed */ - mc_stack.pop_back(); - XBT_DEBUG("Delete state %d at depth %zi", - state->num, mc_stack.size() + 1); - MC_state_delete(state, !state->in_visited_states ? 1 : 0); + XBT_DEBUG("Delete state %d at depth %zi", state->num, stack_.size()); + stack_.pop_back(); visited_state = nullptr; @@ -218,26 +205,26 @@ int SafetyChecker::run() executed before it. If it does then add it to the interleave set of the state that executed that previous request. */ - while (!mc_stack.empty()) { - state = mc_stack.back(); - mc_stack.pop_back(); + while (!stack_.empty()) { + std::unique_ptr state = std::move(stack_.back()); + stack_.pop_back(); if (reductionMode_ == simgrid::mc::ReductionMode::dpor) { - req = MC_state_get_internal_request(state); + req = MC_state_get_internal_request(state.get()); 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); - for (auto i = mc_stack.rbegin(); i != mc_stack.rend(); ++i) { - simgrid::mc::State* prev_state = *i; + 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, MC_state_get_internal_request(prev_state))) { if (XBT_LOG_ISENABLED(mc_safety, xbt_log_priority_debug)) { XBT_DEBUG("Dependent Transitions:"); smx_simcall_t prev_req = MC_state_get_executed_request(prev_state, &value); - req_str = simgrid::mc::request_to_string(prev_req, value, simgrid::mc::RequestType::internal); + char* req_str = simgrid::mc::request_to_string(prev_req, value, simgrid::mc::RequestType::internal); XBT_DEBUG("%s (state=%d)", req_str, prev_state->num); xbt_free(req_str); - prev_req = MC_state_get_executed_request(state, &value); + prev_req = MC_state_get_executed_request(state.get(), &value); req_str = simgrid::mc::request_to_string(prev_req, value, simgrid::mc::RequestType::executed); XBT_DEBUG("%s (state=%d)", req_str, state->num); xbt_free(req_str); @@ -268,20 +255,19 @@ int SafetyChecker::run() } } - if (MC_state_interleave_size(state) - && mc_stack.size() < _sg_mc_max_depth) { + if (MC_state_interleave_size(state.get()) + && stack_.size() < (std::size_t) _sg_mc_max_depth) { /* We found a back-tracking point, let's loop */ XBT_DEBUG("Back-tracking to state %d at depth %zi", - state->num, mc_stack.size() + 1); - mc_stack.push_back(state); - simgrid::mc::replay(mc_stack); + state->num, stack_.size() + 1); + stack_.push_back(std::move(state)); + simgrid::mc::replay(stack_); XBT_DEBUG("Back-tracking to state %d at depth %zi done", - state->num, mc_stack.size()); + stack_.back()->num, stack_.size()); break; } else { XBT_DEBUG("Delete state %d at depth %zi", - state->num, mc_stack.size() + 1); - MC_state_delete(state, !state->in_visited_states ? 1 : 0); + state->num, stack_.size() + 1); } } } @@ -309,12 +295,8 @@ void SafetyChecker::init() XBT_DEBUG("Starting the safety algorithm"); - /* Create exploration stack */ - mc_stack.clear(); - - simgrid::mc::visited_states.clear(); - - simgrid::mc::State* initial_state = MC_state_new(); + std::unique_ptr initial_state = + std::unique_ptr(MC_state_new()); XBT_DEBUG("**************************************************"); XBT_DEBUG("Initial state"); @@ -325,12 +307,12 @@ void SafetyChecker::init() /* 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)) { - MC_state_interleave_process(initial_state, &p.copy); + MC_state_interleave_process(initial_state.get(), &p.copy); if (reductionMode_ != simgrid::mc::ReductionMode::none) break; } - mc_stack.push_back(initial_state); + stack_.push_back(std::move(initial_state)); /* Save the initial state */ initial_global_state = std::unique_ptr(new s_mc_global_t()); @@ -344,6 +326,11 @@ SafetyChecker::SafetyChecker(Session& session) : Checker(session) SafetyChecker::~SafetyChecker() { } + +Checker* createSafetyChecker(Session& session) +{ + return new SafetyChecker(session); +} } }