X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/593c432c9b3f4c9476851d83b167afc9b38f27b5..2376a01092173679830310f4d57b267445959f97:/src/mc/SafetyChecker.cpp diff --git a/src/mc/SafetyChecker.cpp b/src/mc/SafetyChecker.cpp index 3989b9272f..98596c26fc 100644 --- a/src/mc/SafetyChecker.cpp +++ b/src/mc/SafetyChecker.cpp @@ -5,9 +5,10 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include - #include +#include + #include #include #include @@ -29,22 +30,67 @@ 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){ +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); +} - 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; +static int snapshot_compare(simgrid::mc::State* state1, simgrid::mc::State* state2) +{ + 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); +} + +bool SafetyChecker::is_exploration_stack_state(simgrid::mc::State* current_state) +{ + for (auto i = stack_.rbegin(); i != 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 true; + } + return false; +} + +RecordTrace SafetyChecker::getRecordTrace() // override +{ + RecordTrace res; + for (simgrid::mc::State* state : stack_) { + int value = 0; + smx_simcall_t saved_req = MC_state_get_executed_request(state, &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; +} + +std::vector SafetyChecker::getTextualTrace() // override +{ + std::vector trace; + for (simgrid::mc::State* state : stack_) { + int value; + smx_simcall_t req = MC_state_get_executed_request(state, &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); } } - return 0; + return trace; } int SafetyChecker::run() @@ -54,27 +100,28 @@ int SafetyChecker::run() char *req_str = nullptr; int value; smx_simcall_t req = nullptr; - mc_state_t state = nullptr, prev_state = NULL, next_state = NULL; + 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 (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(); 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, 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 (xbt_fifo_size(mc_stack) <= _sg_mc_max_depth && !user_max_depth_reached + if (stack_.size() <= _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); @@ -97,7 +144,7 @@ int SafetyChecker::run() /* Create the new expanded state */ next_state = MC_state_new(); - if(_sg_mc_termination && is_exploration_stack_state(next_state)){ + if(_sg_mc_termination && this->is_exploration_stack_state(next_state)){ MC_show_non_termination(); return SIMGRID_MC_EXIT_NON_TERMINATION; } @@ -118,8 +165,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); - - xbt_fifo_unshift(mc_stack, next_state); + stack_.push_back(next_state); if (dot_output != nullptr) xbt_free(req_str); @@ -129,7 +175,8 @@ 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 (stack_.size() > _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 !"); @@ -139,11 +186,12 @@ int SafetyChecker::run() 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); } 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); + stack_.pop_back(); + XBT_DEBUG("Delete state %d at depth %zi", state->num, stack_.size() + 1); MC_state_delete(state, !state->in_visited_states ? 1 : 0); visited_state = nullptr; @@ -161,14 +209,17 @@ 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()) { + state = stack_.back(); + stack_.pop_back(); if (reductionMode_ == simgrid::mc::ReductionMode::dpor) { req = MC_state_get_internal_request(state); 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; 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)) { @@ -208,15 +259,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) + && stack_.size() < _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(state); + simgrid::mc::replay(stack_); + XBT_DEBUG("Back-tracking to state %d at depth %zi done", + state->num, stack_.size()); break; } else { - XBT_DEBUG("Delete state %d at depth %d", state->num, xbt_fifo_size(mc_stack) + 1); + XBT_DEBUG("Delete state %d at depth %zi", + state->num, stack_.size() + 1); MC_state_delete(state, !state->in_visited_states ? 1 : 0); } } @@ -225,6 +280,7 @@ int SafetyChecker::run() XBT_INFO("No property violation found."); MC_print_statistics(mc_stats); + initial_global_state = nullptr; return SIMGRID_MC_EXIT_SUCCESS; } @@ -244,12 +300,9 @@ void SafetyChecker::init() XBT_DEBUG("Starting the safety algorithm"); - /* Create exploration stack */ - mc_stack = xbt_fifo_new(); - simgrid::mc::visited_states.clear(); - mc_state_t initial_state = MC_state_new(); + simgrid::mc::State* initial_state = MC_state_new(); XBT_DEBUG("**************************************************"); XBT_DEBUG("Initial state"); @@ -265,10 +318,10 @@ void SafetyChecker::init() break; } - xbt_fifo_unshift(mc_stack, initial_state); + stack_.push_back(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); }