X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/76673935f66c0e1606bb1cdc05f37be3c0a135b1..4bcfd40036f842e976d329cd0cee7349b8e0f4d6:/src/mc/checker/SafetyChecker.cpp diff --git a/src/mc/checker/SafetyChecker.cpp b/src/mc/checker/SafetyChecker.cpp index 52e1e70831..faca5d2273 100644 --- a/src/mc/checker/SafetyChecker.cpp +++ b/src/mc/checker/SafetyChecker.cpp @@ -1,5 +1,4 @@ -/* Copyright (c) 2016. 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. */ @@ -18,14 +17,11 @@ #include "src/mc/Transition.hpp" #include "src/mc/VisitedState.hpp" #include "src/mc/checker/SafetyChecker.hpp" -#include "src/mc/mc_exit.h" -#include "src/mc/mc_private.h" -#include "src/mc/mc_record.h" -#include "src/mc/mc_request.h" -#include "src/mc/mc_safety.h" -#include "src/mc/mc_smx.h" -#include "src/mc/mc_state.h" -#include "src/mc/remote/Client.hpp" +#include "src/mc/mc_exit.hpp" +#include "src/mc/mc_private.hpp" +#include "src/mc/mc_record.hpp" +#include "src/mc/mc_request.hpp" +#include "src/mc/mc_smx.hpp" #include "src/xbt/mmalloc/mmprivate.h" @@ -38,9 +34,7 @@ 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) @@ -52,8 +46,9 @@ void SafetyChecker::checkNonTermination(simgrid::mc::State* current_state) 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()); + for (auto const& s : mc_model_checker->getChecker()->getTextualTrace()) + XBT_INFO(" %s", s.c_str()); + simgrid::mc::dumpRecordPath(); simgrid::mc::session->logState(); throw simgrid::mc::TerminationError(); @@ -83,7 +78,6 @@ std::vector SafetyChecker::getTextualTrace() // override 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); @@ -95,14 +89,14 @@ void SafetyChecker::run() * We do so iteratively instead of recursively, dealing with the call stack manually. * This allows to explore the call stack at wish. */ - while (!stack_.empty()) { + while (not stack_.empty()) { /* Get current state */ simgrid::mc::State* state = stack_.back().get(); XBT_DEBUG("**************************************************"); - XBT_DEBUG("Exploration depth=%zi (state=%p, num %d)(%zu interleave)", - stack_.size(), state, state->num, state->interleaveSize()); + XBT_DEBUG("Exploration depth=%zu (state=%p, num %d)(%zu interleave)", stack_.size(), state, state->num, + state->interleaveSize()); mc_model_checker->visited_states++; @@ -129,7 +123,7 @@ void SafetyChecker::run() // req is now the transition of the process that was selected to be executed if (req == nullptr) { - XBT_DEBUG("There are no more processes to interleave. (depth %zi)", stack_.size() + 1); + XBT_DEBUG("There are no more processes to interleave. (depth %zu)", stack_.size() + 1); this->backtrack(); continue; @@ -147,10 +141,10 @@ void SafetyChecker::run() mc_model_checker->executed_transitions++; - /* Actually answer the request: let the remote process do execute that request */ + /* Actually answer the request: let execute the selected request (MCed does one step) */ this->getSession().execute(state->transition); - /* Create the new expanded state */ + /* 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_)); @@ -158,19 +152,21 @@ void SafetyChecker::run() this->checkNonTermination(next_state.get()); /* Check whether we already explored next_state in the past (but only if interested in state-equality reduction) */ - if (_sg_mc_visited == true) + if (_sg_mc_max_visited_states > 0) visitedState_ = visitedStates_.addVisitedState(expandedStatesCount_, next_state.get(), true); /* If this is a new state (or if we don't care about state-equality reduction) */ if (visitedState_ == nullptr) { /* Get an enabled process and insert it in the interleave set of the next state */ - for (auto& actor : mc_model_checker->process().actors()) - if (simgrid::mc::actor_is_enabled(actor.copy.getBuffer())) { - next_state->interleave(actor.copy.getBuffer()); + for (auto& remoteActor : mc_model_checker->process().actors()) { + auto actor = remoteActor.copy.getBuffer(); + if (simgrid::mc::actor_is_enabled(actor)) { + next_state->addInterleavingSet(actor); if (reductionMode_ == simgrid::mc::ReductionMode::dpor) - break; + break; // With DPOR, we take the first enabled transition } + } if (dot_output != nullptr) std::fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n", @@ -205,14 +201,14 @@ void SafetyChecker::backtrack() executed before it. If it does then add it to the interleave set of the state that executed that previous request. */ - while (!stack_.empty()) { + while (not 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"); + 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(); @@ -233,8 +229,8 @@ void SafetyChecker::backtrack() state->num); } - if (!prev_state->processStates[issuer->pid].isDone()) - prev_state->interleave(issuer); + if (not prev_state->actorStates[issuer->get_pid()].isDone()) + prev_state->addInterleavingSet(issuer); else XBT_DEBUG("Process %p is in done set", req->issuer); @@ -248,12 +244,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 independant", - 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,15 +254,13 @@ void SafetyChecker::backtrack() 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); + XBT_DEBUG("Back-tracking to state %d at depth %zu", 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()); + XBT_DEBUG("Back-tracking to state %d at depth %zu done", stack_.back()->num, stack_.size()); break; } else { - XBT_DEBUG("Delete state %d at depth %zi", - state->num, stack_.size() + 1); + XBT_DEBUG("Delete state %d at depth %zu", state->num, stack_.size() + 1); } } } @@ -277,9 +268,9 @@ void SafetyChecker::backtrack() void SafetyChecker::restoreState() { /* 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) { + simgrid::mc::restore_snapshot(last_state->system_state); return; } @@ -297,7 +288,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) @@ -308,7 +299,9 @@ SafetyChecker::SafetyChecker(Session& session) : Checker(session) if (_sg_mc_termination) XBT_INFO("Check non progressive cycles"); else - XBT_INFO("Check a safety property"); + XBT_INFO("Check a safety property. Reduction is: %s.", + (reductionMode_ == simgrid::mc::ReductionMode::none ? "none": + (reductionMode_ == simgrid::mc::ReductionMode::dpor ? "dpor": "unknown"))); simgrid::mc::session->initialize(); XBT_DEBUG("Starting the safety algorithm"); @@ -322,7 +315,7 @@ SafetyChecker::SafetyChecker(Session& session) : Checker(session) /* Get an enabled actor and insert it in the interleave set of the initial state */ for (auto& actor : mc_model_checker->process().actors()) if (simgrid::mc::actor_is_enabled(actor.copy.getBuffer())) { - initial_state->interleave(actor.copy.getBuffer()); + initial_state->addInterleavingSet(actor.copy.getBuffer()); if (reductionMode_ != simgrid::mc::ReductionMode::none) break; } @@ -330,14 +323,10 @@ SafetyChecker::SafetyChecker(Session& session) : Checker(session) stack_.push_back(std::move(initial_state)); } -SafetyChecker::~SafetyChecker() +Checker* createSafetyChecker(Session& s) { + return new SafetyChecker(s); } -Checker* createSafetyChecker(Session& session) -{ - return new SafetyChecker(session); -} - } }