X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d20f024dba9ff1e9c8822237caaf963b9e913889..90136cb8268510961005b533a970c61282a1f37c:/src/mc/checker/SafetyChecker.cpp diff --git a/src/mc/checker/SafetyChecker.cpp b/src/mc/checker/SafetyChecker.cpp index 0003a8fb28..796bed5382 100644 --- a/src/mc/checker/SafetyChecker.cpp +++ b/src/mc/checker/SafetyChecker.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2016-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2016-2019. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -17,6 +17,7 @@ #include "src/mc/Transition.hpp" #include "src/mc/VisitedState.hpp" #include "src/mc/checker/SafetyChecker.hpp" +#include "src/mc/mc_config.hpp" #include "src/mc/mc_exit.hpp" #include "src/mc/mc_private.hpp" #include "src/mc/mc_record.hpp" @@ -34,12 +35,10 @@ static int snapshot_compare(simgrid::mc::State* state1, simgrid::mc::State* stat { 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); + return snapshot_compare(s1, s2); } -void SafetyChecker::checkNonTermination(simgrid::mc::State* current_state) +void SafetyChecker::check_non_termination(simgrid::mc::State* current_state) { for (auto state = stack_.rbegin(); state != stack_.rend(); ++state) if (snapshot_compare(state->get(), current_state) == 0) { @@ -48,15 +47,16 @@ void SafetyChecker::checkNonTermination(simgrid::mc::State* current_state) XBT_INFO("*** NON-PROGRESSIVE CYCLE DETECTED ***"); XBT_INFO("******************************************"); XBT_INFO("Counter-example execution trace:"); - for (auto const& s : mc_model_checker->getChecker()->getTextualTrace()) - XBT_INFO("%s", s.c_str()); - simgrid::mc::session->logState(); + for (auto const& s : mc_model_checker->getChecker()->get_textual_trace()) + XBT_INFO(" %s", s.c_str()); + simgrid::mc::dumpRecordPath(); + simgrid::mc::session->log_state(); throw simgrid::mc::TerminationError(); } } -RecordTrace SafetyChecker::getRecordTrace() // override +RecordTrace SafetyChecker::get_record_trace() // override { RecordTrace res; for (auto const& state : stack_) @@ -64,7 +64,7 @@ RecordTrace SafetyChecker::getRecordTrace() // override return res; } -std::vector SafetyChecker::getTextualTrace() // override +std::vector SafetyChecker::get_textual_trace() // override { std::vector trace; for (auto const& state : stack_) { @@ -77,10 +77,9 @@ std::vector SafetyChecker::getTextualTrace() // override return trace; } -void SafetyChecker::logState() // override +void SafetyChecker::log_state() // override { - Checker::logState(); - XBT_INFO("Expanded states = %lu", expandedStatesCount_); + XBT_INFO("Expanded states = %lu", expanded_states_count_); XBT_INFO("Visited states = %lu", mc_model_checker->visited_states); XBT_INFO("Executed transitions = %lu", mc_model_checker->executed_transitions); } @@ -110,11 +109,11 @@ void SafetyChecker::run() } // Backtrack if we are revisiting a state we saw previously - if (visitedState_ != nullptr) { + if (visited_state_ != nullptr) { XBT_DEBUG("State already visited (equal to state %d), exploration stopped on this path.", - visitedState_->original_num == -1 ? visitedState_->num : visitedState_->original_num); + visited_state_->original_num == -1 ? visited_state_->num : visited_state_->original_num); - visitedState_ = nullptr; + visited_state_ = nullptr; this->backtrack(); continue; } @@ -144,21 +143,21 @@ void SafetyChecker::run() mc_model_checker->executed_transitions++; /* Actually answer the request: let execute the selected request (MCed does one step) */ - this->getSession().execute(state->transition); + this->get_session().execute(state->transition); /* Create the new expanded state (copy the state of MCed into our MCer data) */ std::unique_ptr next_state = - std::unique_ptr(new simgrid::mc::State(++expandedStatesCount_)); + std::unique_ptr(new simgrid::mc::State(++expanded_states_count_)); if (_sg_mc_termination) - this->checkNonTermination(next_state.get()); + this->check_non_termination(next_state.get()); /* Check whether we already explored next_state in the past (but only if interested in state-equality reduction) */ if (_sg_mc_max_visited_states > 0) - visitedState_ = visitedStates_.addVisitedState(expandedStatesCount_, next_state.get(), true); + visited_state_ = visited_states_.addVisitedState(expanded_states_count_, next_state.get(), true); /* If this is a new state (or if we don't care about state-equality reduction) */ - if (visitedState_ == nullptr) { + if (visited_state_ == nullptr) { /* Get an enabled process and insert it in the interleave set of the next state */ for (auto& remoteActor : mc_model_checker->process().actors()) { @@ -176,14 +175,14 @@ void SafetyChecker::run() } else if (dot_output != nullptr) std::fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n", state->num, - visitedState_->original_num == -1 ? visitedState_->num : visitedState_->original_num, + visited_state_->original_num == -1 ? visited_state_->num : visited_state_->original_num, req_str.c_str()); stack_.push_back(std::move(next_state)); } XBT_INFO("No property violation found."); - simgrid::mc::session->logState(); + simgrid::mc::session->log_state(); } void SafetyChecker::backtrack() @@ -231,7 +230,7 @@ void SafetyChecker::backtrack() state->num); } - if (not prev_state->actorStates[issuer->pid].isDone()) + if (not prev_state->actorStates[issuer->get_pid()].isDone()) prev_state->addInterleavingSet(issuer); else XBT_DEBUG("Process %p is in done set", req->issuer); @@ -246,12 +245,9 @@ void SafetyChecker::backtrack() } else { 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 independent", - req->call, issuer->pid, state->num, - prev_state->internal_req.call, - previous_issuer->pid, + XBT_DEBUG("Simcall %d, process %ld (state %d) and simcall %d, process %ld (state %d) are independent", + req->call, issuer->get_pid(), state->num, prev_state->internal_req.call, previous_issuer->get_pid(), prev_state->num); - } } } @@ -261,7 +257,7 @@ void SafetyChecker::backtrack() /* We found a back-tracking point, let's loop */ XBT_DEBUG("Back-tracking to state %d at depth %zu", state->num, stack_.size() + 1); stack_.push_back(std::move(state)); - this->restoreState(); + this->restore_state(); XBT_DEBUG("Back-tracking to state %d at depth %zu done", stack_.back()->num, stack_.size()); break; } else { @@ -270,17 +266,17 @@ void SafetyChecker::backtrack() } } -void SafetyChecker::restoreState() +void SafetyChecker::restore_state() { /* Intermediate backtracking */ - simgrid::mc::State* state = stack_.back().get(); - if (state->system_state) { - simgrid::mc::restore_snapshot(state->system_state); + simgrid::mc::State* last_state = stack_.back().get(); + if (last_state->system_state) { + last_state->system_state->restore(&mc_model_checker->process()); return; } /* Restore the initial state */ - simgrid::mc::session->restoreInitialState(); + simgrid::mc::session->restore_initial_state(); /* Traverse the stack from the state at position start and re-execute the transitions */ for (std::unique_ptr const& state : stack_) { @@ -293,7 +289,7 @@ void SafetyChecker::restoreState() } } -SafetyChecker::SafetyChecker(Session& session) : Checker(session) +SafetyChecker::SafetyChecker(Session& s) : Checker(s) { reductionMode_ = simgrid::mc::reduction_mode; if (_sg_mc_termination) @@ -312,7 +308,7 @@ SafetyChecker::SafetyChecker(Session& session) : Checker(session) XBT_DEBUG("Starting the safety algorithm"); std::unique_ptr initial_state = - std::unique_ptr(new simgrid::mc::State(++expandedStatesCount_)); + std::unique_ptr(new simgrid::mc::State(++expanded_states_count_)); XBT_DEBUG("**************************************************"); XBT_DEBUG("Initial state"); @@ -328,9 +324,9 @@ SafetyChecker::SafetyChecker(Session& session) : Checker(session) stack_.push_back(std::move(initial_state)); } -Checker* createSafetyChecker(Session& session) +Checker* createSafetyChecker(Session& s) { - return new SafetyChecker(session); + return new SafetyChecker(s); } }