X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2376a01092173679830310f4d57b267445959f97..8cf6e30af8de6686461b6b1b52ba578df01de985:/src/mc/SafetyChecker.cpp diff --git a/src/mc/SafetyChecker.cpp b/src/mc/SafetyChecker.cpp index 98596c26fc..0c8d7aff95 100644 --- a/src/mc/SafetyChecker.cpp +++ b/src/mc/SafetyChecker.cpp @@ -7,12 +7,11 @@ #include #include -#include +#include +#include +#include #include -#include -#include -#include #include #include "src/mc/mc_state.h" @@ -25,6 +24,9 @@ #include "src/mc/mc_exit.h" #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) @@ -53,10 +55,10 @@ static int snapshot_compare(simgrid::mc::State* state1, simgrid::mc::State* stat return snapshot_compare(num1, s1, num2, s2); } -bool SafetyChecker::is_exploration_stack_state(simgrid::mc::State* current_state) +bool SafetyChecker::checkNonTermination(simgrid::mc::State* current_state) { for (auto i = stack_.rbegin(); i != stack_.rend(); ++i) - if(snapshot_compare(*i, current_state) == 0){ + if (snapshot_compare(i->get(), current_state) == 0){ XBT_INFO("Non-progressive cycle : state %d -> state %d", (*i)->num, current_state->num); return true; @@ -67,221 +69,240 @@ bool SafetyChecker::is_exploration_stack_state(simgrid::mc::State* current_state 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)); - } + for (auto const& state : stack_) + res.push_back(state->getTransition()); 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); - } + for (auto const& state : stack_) { + int value = state->transition.argument; + smx_simcall_t req = &state->executed_req; + if (req) + trace.push_back(simgrid::mc::request_to_string( + req, value, simgrid::mc::RequestType::executed)); } 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(); - 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 (!stack_.empty()) { /* Get current state */ - simgrid::mc::State* state = 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)", + "Exploration depth=%zi (state=%p, num %d)(%zu interleave)", stack_.size(), state, state->num, - MC_state_interleave_size(state), user_max_depth_reached); + state->interleaveSize()); + + mc_model_checker->visited_states++; + + // The interleave set is empty or the maximum depth is reached, + // let's back-track. + smx_simcall_t req = nullptr; + if (stack_.size() > (std::size_t) _sg_mc_max_depth + || (req = MC_state_get_request(state)) == nullptr + || visitedState_ != nullptr) { + int res = this->backtrack(); + if (res) + return res; + else + continue; + } - /* 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. + XBT_DEBUG("Execute: %s", + simgrid::mc::request_to_string( + req, state->transition.argument, simgrid::mc::RequestType::simix).c_str()); - /* If there are processes to interleave and the maximum depth has not been reached - then perform one step of the exploration algorithm */ - if (stack_.size() <= _sg_mc_max_depth && !user_max_depth_reached - && (req = MC_state_get_request(state, &value)) && visited_state == nullptr) { + std::string req_str; + if (dot_output != nullptr) + req_str = simgrid::mc::request_get_dot_output(req, state->transition.argument); - req_str = simgrid::mc::request_to_string(req, value, simgrid::mc::RequestType::simix); - XBT_DEBUG("Execute: %s", req_str); - xbt_free(req_str); + mc_model_checker->executed_transitions++; - if (dot_output != nullptr) - req_str = simgrid::mc::request_get_dot_output(req, value); + /* Answer the request */ + this->getSession().execute(state->transition); - MC_state_set_executed_request(state, req, value); - mc_stats->executed_transitions++; + /* Create the new expanded state */ + std::unique_ptr next_state = + std::unique_ptr(MC_state_new(++expandedStatesCount_)); - // TODO, bundle both operations in a single message - // MC_execute_transition(req, value) + if (_sg_mc_termination && this->checkNonTermination(next_state.get())) { + MC_show_non_termination(); + return SIMGRID_MC_EXIT_NON_TERMINATION; + } - /* Answer the request */ - simgrid::mc::handle_simcall(req, value); - mc_model_checker->wait_for_requests(); + if (_sg_mc_visited == 0 + || (visitedState_ = visitedStates_.addVisitedState(expandedStatesCount_, next_state.get(), true)) == nullptr) { - /* Create the new expanded state */ - next_state = MC_state_new(); + /* 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.getBuffer())) { + next_state->interleave(p.copy.getBuffer()); + if (reductionMode_ != simgrid::mc::ReductionMode::none) + break; + } - if(_sg_mc_termination && this->is_exploration_stack_state(next_state)){ - MC_show_non_termination(); - return SIMGRID_MC_EXIT_NON_TERMINATION; - } + if (dot_output != nullptr) + std::fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n", + state->num, next_state->num, req_str.c_str()); - if (_sg_mc_visited == 0 || (visited_state = simgrid::mc::is_visited_state(next_state, true)) == nullptr) { + } else if (dot_output != nullptr) + std::fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n", + state->num, + visitedState_->other_num == -1 ? visitedState_->num : visitedState_->other_num, req_str.c_str()); - /* 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); - if (reductionMode_ != simgrid::mc::ReductionMode::none) - break; - } + stack_.push_back(std::move(next_state)); + } - if (dot_output != nullptr) - std::fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n", state->num, next_state->num, req_str); + XBT_INFO("No property violation found."); + simgrid::mc::session->logState(); + return SIMGRID_MC_EXIT_SUCCESS; +} - } 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); +int SafetyChecker::backtrack() +{ + 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.", + visitedState_->other_num == -1 ? visitedState_->num : visitedState_->other_num); + } else + XBT_DEBUG("There are no more processes to interleave. (depth %zi)", + stack_.size() + 1); + + stack_.pop_back(); + + visitedState_ = nullptr; + + /* Check for deadlocks */ + if (mc_model_checker->checkDeadlock()) { + MC_show_deadlock(); + return SIMGRID_MC_EXIT_DEADLOCK; + } - stack_.push_back(next_state); + /* Traverse the stack backwards until a state with a non empty interleave + set is found, deleting all the states that have it empty in the way. + For each deleted state, check if the request that has generated it + (from it's predecesor state), depends on any other previous request + executed before it. If it does then add it to the interleave set of the + state that executed that previous request. */ - if (dot_output != nullptr) - xbt_free(req_str); - - /* Let's loop again */ + while (!stack_.empty()) { + std::unique_ptr state = std::move(stack_.back()); + stack_.pop_back(); + if (reductionMode_ == simgrid::mc::ReductionMode::dpor) { + smx_simcall_t req = &state->internal_req; + 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_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->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->transition.argument; + prev_req = &state->executed_req; + XBT_DEBUG("%s (state=%d)", + simgrid::mc::request_to_string( + prev_req, value, simgrid::mc::RequestType::executed).c_str(), + state->num); + } - /* The interleave set is empty or the maximum depth is reached, let's back-track */ - } else { + if (!prev_state->processStates[issuer->pid].isDone()) + prev_state->interleave(issuer); + else + XBT_DEBUG("Process %p is in done set", req->issuer); - if (stack_.size() > _sg_mc_max_depth || user_max_depth_reached - || visited_state != nullptr) { + break; - if (user_max_depth_reached && visited_state == nullptr) - XBT_DEBUG("User max depth reached !"); - else if (visited_state == 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); + } else if (req->issuer == prev_state->internal_req.issuer) { - } else - XBT_DEBUG("There are no more processes to interleave. (depth %zi)", - stack_.size() + 1); + XBT_DEBUG("Simcall %d and %d with same issuer", req->call, prev_state->internal_req.call); + break; - /* Trash the current state, no longer needed */ - 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); + } else { - visited_state = nullptr; + 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, + previous_issuer->pid, + prev_state->num); - /* Check for deadlocks */ - if (mc_model_checker->checkDeadlock()) { - MC_show_deadlock(); - return SIMGRID_MC_EXIT_DEADLOCK; + } } + } - /* Traverse the stack backwards until a state with a non empty interleave - set is found, deleting all the states that have it empty in the way. - For each deleted state, check if the request that has generated it - (from it's predecesor state), depends on any other previous request - executed before it. If it does then add it to the interleave set of the - state that executed that previous request. */ - - 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); - 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)) { - 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); - XBT_DEBUG("%s (state=%d)", req_str, prev_state->num); - xbt_free(req_str); - prev_req = MC_state_get_executed_request(state, &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); - } - - if (!MC_state_process_is_done(prev_state, issuer)) - MC_state_interleave_process(prev_state, issuer); - else - XBT_DEBUG("Process %p is in done set", req->issuer); - - break; - - } else if (req->issuer == MC_state_get_internal_request(prev_state)->issuer) { - - XBT_DEBUG("Simcall %d and %d with same issuer", req->call, MC_state_get_internal_request(prev_state)->call); - break; - - } else { - - const smx_process_t previous_issuer = MC_smx_simcall_get_issuer(MC_state_get_internal_request(prev_state)); - XBT_DEBUG("Simcall %d, process %lu (state %d) and simcall %d, process %lu (state %d) are independant", - req->call, issuer->pid, state->num, - MC_state_get_internal_request(prev_state)->call, - previous_issuer->pid, - prev_state->num); - - } - } - } + if (state->interleaveSize() + && 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, stack_.size() + 1); + stack_.push_back(std::move(state)); + this->restoreState(); + 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 %zi", + state->num, stack_.size() + 1); + } + } + return SIMGRID_MC_EXIT_SUCCESS; +} - 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 %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 %zi", - state->num, stack_.size() + 1); - MC_state_delete(state, !state->in_visited_states ? 1 : 0); - } - } +void SafetyChecker::restoreState() +{ + /* Intermediate backtracking */ + { + simgrid::mc::State* state = stack_.back().get(); + if (state->system_state) { + simgrid::mc::restore_snapshot(state->system_state); + return; } } - XBT_INFO("No property violation found."); - MC_print_statistics(mc_stats); - initial_global_state = nullptr; - return SIMGRID_MC_EXIT_SUCCESS; + /* 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() @@ -296,33 +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"); - simgrid::mc::visited_states.clear(); - - simgrid::mc::State* initial_state = MC_state_new(); + std::unique_ptr initial_state = + 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)) { - MC_state_interleave_process(initial_state, &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(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); + stack_.push_back(std::move(initial_state)); } SafetyChecker::SafetyChecker(Session& session) : Checker(session) @@ -332,6 +345,11 @@ SafetyChecker::SafetyChecker(Session& session) : Checker(session) SafetyChecker::~SafetyChecker() { } + +Checker* createSafetyChecker(Session& session) +{ + return new SafetyChecker(session); +} } }