X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2dba4579bf4c7f7e8cde2b36ff308645a3cc891b..b8df87e176f27b25534f27d7e240defa32ca35bc:/src/mc/checker/SafetyChecker.cpp diff --git a/src/mc/checker/SafetyChecker.cpp b/src/mc/checker/SafetyChecker.cpp index 643c734c5b..51c0a97f94 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" @@ -52,7 +48,7 @@ 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()) + for (auto const& s : mc_model_checker->getChecker()->getTextualTrace()) XBT_INFO("%s", s.c_str()); simgrid::mc::session->logState(); @@ -83,7 +79,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 +90,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 +124,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; @@ -165,12 +160,14 @@ void SafetyChecker::run() 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,7 +202,7 @@ 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) { @@ -233,8 +230,8 @@ void SafetyChecker::backtrack() state->num); } - if (!prev_state->actorStates[issuer->pid].isDone()) - prev_state->interleave(issuer); + if (not prev_state->actorStates[issuer->pid_].isDone()) + prev_state->addInterleavingSet(issuer); else XBT_DEBUG("Process %p is in done set", req->issuer); @@ -248,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->pid_, state->num, prev_state->internal_req.call, previous_issuer->pid_, prev_state->num); - } } } @@ -261,15 +255,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); } } } @@ -324,7 +316,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; } @@ -332,14 +324,10 @@ SafetyChecker::SafetyChecker(Session& session) : Checker(session) stack_.push_back(std::move(initial_state)); } -SafetyChecker::~SafetyChecker() -{ -} - Checker* createSafetyChecker(Session& session) { return new SafetyChecker(session); } - + } }