X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/082cedd275c8f6dc3478097595380d3e496c74f6..7d9763f5619c35b79077e30f5d32de44699824a6:/src/mc/SafetyChecker.cpp diff --git a/src/mc/SafetyChecker.cpp b/src/mc/SafetyChecker.cpp index 442b871eed..68d89d75f3 100644 --- a/src/mc/SafetyChecker.cpp +++ b/src/mc/SafetyChecker.cpp @@ -5,13 +5,11 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include - #include +#include + #include -#include -#include -#include #include #include "src/mc/mc_state.h" @@ -24,86 +22,103 @@ #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 "); - namespace simgrid { namespace mc { -static int is_exploration_stack_state(mc_state_t current_state){ - - xbt_fifo_item_t item; - mc_state_t stack_state; - for(item = xbt_fifo_get_first_item(mc_stack); item != nullptr; item = xbt_fifo_get_next_item(item)) { - stack_state = (mc_state_t) xbt_fifo_get_item_content(item); - if(snapshot_compare(stack_state, current_state) == 0){ - XBT_INFO("Non-progressive cycle : state %d -> state %d", stack_state->num, current_state->num); - return 1; - } - } - return 0; +static void MC_show_non_termination(void) +{ + XBT_INFO("******************************************"); + XBT_INFO("*** NON-PROGRESSIVE CYCLE DETECTED ***"); + XBT_INFO("******************************************"); + 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); } -/** - * \brief Initialize the DPOR exploration algorithm - */ -void SafetyChecker::pre() +static int snapshot_compare(simgrid::mc::State* state1, simgrid::mc::State* state2) { - simgrid::mc::visited_states.clear(); - - mc_state_t initial_state = MC_state_new(); + simgrid::mc::Snapshot* s1 = state1->system_state.get(); + simgrid::mc::Snapshot* s2 = state2->system_state.get(); + int num1 = state1->num; + int num2 = state2->num; + return snapshot_compare(num1, s1, num2, s2); +} - XBT_DEBUG("**************************************************"); - XBT_DEBUG("Initial state"); +bool SafetyChecker::checkNonTermination(simgrid::mc::State* current_state) +{ + 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 false; +} - /* Wait for requests (schedules processes) */ - mc_model_checker->wait_for_requests(); +RecordTrace SafetyChecker::getRecordTrace() // override +{ + RecordTrace res; + for (auto const& state : stack_) { + int value = 0; + 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)); + } + return res; +} - /* 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); - if (reductionMode_ != simgrid::mc::ReductionMode::none) - break; +std::vector SafetyChecker::getTextualTrace() // override +{ + std::vector trace; + for (auto const& state : stack_) { + int 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); + trace.push_back(req_str); + xbt_free(req_str); } - - xbt_fifo_unshift(mc_stack, initial_state); + } + return trace; } int SafetyChecker::run() { this->init(); - char *req_str = nullptr; int value; smx_simcall_t req = nullptr; - mc_state_t state = nullptr, prev_state = NULL, next_state = NULL; - xbt_fifo_item_t item = nullptr; - std::unique_ptr visited_state = nullptr; - while (xbt_fifo_size(mc_stack) > 0) { + while (!stack_.empty()) { /* Get current state */ - state = (mc_state_t)xbt_fifo_get_item_content(xbt_fifo_get_first_item(mc_stack)); + simgrid::mc::State* state = stack_.back().get(); XBT_DEBUG("**************************************************"); - XBT_DEBUG - ("Exploration depth=%d (state=%p, num %d)(%u interleave, user_max_depth %d)", - xbt_fifo_size(mc_stack), state, state->num, - MC_state_interleave_size(state), user_max_depth_reached); + XBT_DEBUG( + "Exploration depth=%zi (state=%p, num %d)(%u interleave)", + stack_.size(), state, state->num, + MC_state_interleave_size(state)); /* 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 (xbt_fifo_size(mc_stack) <= _sg_mc_max_depth && !user_max_depth_reached - && (req = MC_state_get_request(state, &value)) && visited_state == nullptr) { + if (stack_.size() <= (std::size_t) _sg_mc_max_depth + && (req = MC_state_get_request(state, &value)) != nullptr + && visitedState_ == 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); @@ -121,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->checkNonTermination(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 + || (visitedState_ = 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; } @@ -142,10 +159,9 @@ int SafetyChecker::run() std::fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n", state->num, next_state->num, req_str); } 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); - + std::fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n", state->num, visitedState_->other_num == -1 ? visitedState_->num : visitedState_->other_num, req_str); - xbt_fifo_unshift(mc_stack, next_state); + stack_.push_back(std::move(next_state)); if (dot_output != nullptr) xbt_free(req_str); @@ -155,28 +171,27 @@ int SafetyChecker::run() /* The interleave set is empty or the maximum depth is reached, let's back-track */ } else { - if ((xbt_fifo_size(mc_stack) > _sg_mc_max_depth) || user_max_depth_reached || visited_state != nullptr) { - - if (user_max_depth_reached && visited_state == nullptr) - XBT_DEBUG("User max depth reached !"); - else if (visited_state == nullptr) + if (stack_.size() > (std::size_t) _sg_mc_max_depth + || visitedState_ != nullptr) { + if (visitedState_ == nullptr) XBT_WARN("/!\\ Max depth reached ! /!\\ "); else - XBT_DEBUG("State already visited (equal to state %d), exploration stopped on this path.", visited_state->other_num == -1 ? visited_state->num : visited_state->other_num); - + XBT_DEBUG("State already visited (equal to state %d)," + " exploration stopped on this path.", + visitedState_->other_num == -1 ? visitedState_->num : visitedState_->other_num); } else - XBT_DEBUG("There are no more processes to interleave. (depth %d)", xbt_fifo_size(mc_stack) + 1); + XBT_DEBUG("There are no more processes to interleave. (depth %zi)", + stack_.size() + 1); /* Trash the current state, no longer needed */ - xbt_fifo_shift(mc_stack); - XBT_DEBUG("Delete state %d at depth %d", state->num, xbt_fifo_size(mc_stack) + 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; + visitedState_ = nullptr; /* Check for deadlocks */ if (mc_model_checker->checkDeadlock()) { - MC_show_deadlock(nullptr); + MC_show_deadlock(); return SIMGRID_MC_EXIT_DEADLOCK; } @@ -187,23 +202,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 ((state = (mc_state_t) xbt_fifo_shift(mc_stack))) { + 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); - xbt_fifo_foreach(mc_stack, item, prev_state, mc_state_t) { + 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); @@ -234,16 +252,19 @@ int SafetyChecker::run() } } - if (MC_state_interleave_size(state) && xbt_fifo_size(mc_stack) < _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 %d", state->num, xbt_fifo_size(mc_stack) + 1); - xbt_fifo_unshift(mc_stack, state); - MC_replay(mc_stack); - XBT_DEBUG("Back-tracking to state %d at depth %d done", state->num, xbt_fifo_size(mc_stack)); + 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_); + XBT_DEBUG("Back-tracking to state %d at depth %zi done", + stack_.back()->num, stack_.size()); break; } else { - XBT_DEBUG("Delete state %d at depth %d", state->num, xbt_fifo_size(mc_stack) + 1); - MC_state_delete(state, !state->in_visited_states ? 1 : 0); + XBT_DEBUG("Delete state %d at depth %zi", + state->num, stack_.size() + 1); } } } @@ -251,6 +272,7 @@ int SafetyChecker::run() XBT_INFO("No property violation found."); MC_print_statistics(mc_stats); + initial_global_state = nullptr; return SIMGRID_MC_EXIT_SUCCESS; } @@ -270,13 +292,27 @@ void SafetyChecker::init() XBT_DEBUG("Starting the safety algorithm"); - /* Create exploration stack */ - mc_stack = xbt_fifo_new(); + std::unique_ptr initial_state = + std::unique_ptr(MC_state_new()); + + 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)) { + MC_state_interleave_process(initial_state.get(), &p.copy); + if (reductionMode_ != simgrid::mc::ReductionMode::none) + break; + } - this->pre(); + stack_.push_back(std::move(initial_state)); /* Save the initial state */ - initial_global_state = xbt_new0(s_mc_global_t, 1); + initial_global_state = std::unique_ptr(new s_mc_global_t()); initial_global_state->snapshot = simgrid::mc::take_snapshot(0); } @@ -287,6 +323,11 @@ SafetyChecker::SafetyChecker(Session& session) : Checker(session) SafetyChecker::~SafetyChecker() { } + +Checker* createSafetyChecker(Session& session) +{ + return new SafetyChecker(session); +} } }