X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/50753d5f8442a47c17c4035724201a18a7ff6146..3b56ba0e1914362b1c7e6b7d84bf72e2fe88f3c2:/src/mc/api/State.cpp diff --git a/src/mc/api/State.cpp b/src/mc/api/State.cpp index b35f37e3fc..bccd340ac8 100644 --- a/src/mc/api/State.cpp +++ b/src/mc/api/State.cpp @@ -4,8 +4,8 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "src/mc/api/State.hpp" -#include "src/mc/api/guide/BasicGuide.hpp" -#include "src/mc/api/guide/WaitGuide.hpp" +#include "src/mc/api/strategy/BasicStrategy.hpp" +#include "src/mc/api/strategy/WaitStrategy.hpp" #include "src/mc/explo/Exploration.hpp" #include "src/mc/mc_config.hpp" @@ -20,34 +20,42 @@ long State::expended_states_ = 0; State::State(RemoteApp& remote_app) : num_(++expended_states_) { XBT_VERB("Creating a guide for the state"); - if (_sg_mc_guided == "none") - guide_ = std::make_unique(); - if (_sg_mc_guided == "nb_wait") - guide_ = std::make_unique(); + if (_sg_mc_strategy == "none") + strategy_ = std::make_shared(); + if (_sg_mc_strategy == "nb_wait") + strategy_ = std::make_shared(); - remote_app.get_actors_status(guide_->actors_to_run_); + recipe_ = std::list(); + remote_app.get_actors_status(strategy_->actors_to_run_); + +#if SIMGRID_HAVE_STATEFUL_MC /* Stateful model checking */ if ((_sg_mc_checkpoint > 0 && (num_ % _sg_mc_checkpoint == 0)) || _sg_mc_termination) system_state_ = std::make_shared(num_, remote_app.get_page_store(), *remote_app.get_remote_process_memory()); +#endif } -State::State(RemoteApp& remote_app, const State* parent_state) : num_(++expended_states_), parent_state_(parent_state) +State::State(RemoteApp& remote_app, std::shared_ptr parent_state) + : num_(++expended_states_), parent_state_(parent_state) { + if (_sg_mc_strategy == "none") + strategy_ = std::make_shared(); + if (_sg_mc_strategy == "nb_wait") + strategy_ = std::make_shared(); + *strategy_ = *(parent_state->strategy_); - if (_sg_mc_guided == "none") - guide_ = std::make_unique(); - if (_sg_mc_guided == "nb_wait") - guide_ = std::make_unique(); - *guide_ = *(parent_state->guide_); + recipe_ = std::list(parent_state_->get_recipe()); + recipe_.push_back(parent_state_->get_transition()); - remote_app.get_actors_status(guide_->actors_to_run_); + remote_app.get_actors_status(strategy_->actors_to_run_); - /* Stateful model checking */ +#if SIMGRID_HAVE_STATEFUL_MC /* Stateful model checking */ if ((_sg_mc_checkpoint > 0 && (num_ % _sg_mc_checkpoint == 0)) || _sg_mc_termination) system_state_ = std::make_shared(num_, remote_app.get_page_store(), *remote_app.get_remote_process_memory()); +#endif /* If we want sleep set reduction, copy the sleep set and eventually removes things from it */ if (_sg_mc_sleep_set) { @@ -55,14 +63,12 @@ State::State(RemoteApp& remote_app, const State* parent_state) : num_(++expended * And if we kept it and the actor is enabled in this state, mark the actor as already done, so that * it is not explored*/ for (auto& [aid, transition] : parent_state_->get_sleep_set()) { - if (not parent_state_->get_transition()->depends(&transition)) { - sleep_set_.try_emplace(aid, transition); - if (guide_->actors_to_run_.count(aid) != 0) { + if (strategy_->actors_to_run_.count(aid) != 0) { XBT_DEBUG("Actor %ld will not be explored, for it is in the sleep set", aid); - guide_->actors_to_run_.at(aid).mark_done(); + strategy_->actors_to_run_.at(aid).mark_done(); } } else XBT_DEBUG("Transition >>%s<< removed from the sleep set because it was dependent with >>%s<<", @@ -73,7 +79,17 @@ State::State(RemoteApp& remote_app, const State* parent_state) : num_(++expended std::size_t State::count_todo() const { - return boost::range::count_if(this->guide_->actors_to_run_, [](auto& pair) { return pair.second.is_todo(); }); + return boost::range::count_if(this->strategy_->actors_to_run_, [](auto& pair) { return pair.second.is_todo(); }); +} + +std::size_t State::count_todo_multiples() const +{ + size_t count = 0; + for (auto const& [_, actor] : strategy_->actors_to_run_) + if (actor.is_todo()) + count += actor.get_times_not_considered(); + + return count; } Transition* State::get_transition() const @@ -83,11 +99,10 @@ Transition* State::get_transition() const aid_t State::next_transition() const { - XBT_DEBUG("Search for an actor to run. %zu actors to consider", guide_->actors_to_run_.size()); - for (auto const& [aid, actor] : guide_->actors_to_run_) { + XBT_DEBUG("Search for an actor to run. %zu actors to consider", strategy_->actors_to_run_.size()); + for (auto const& [aid, actor] : strategy_->actors_to_run_) { /* Only consider actors (1) marked as interleaving by the checker and (2) currently enabled in the application */ if (not actor.is_todo() || not actor.is_enabled() || actor.is_done()) { - if (not actor.is_todo()) XBT_DEBUG("Can't run actor %ld because it is not todo", aid); @@ -105,22 +120,22 @@ aid_t State::next_transition() const return -1; } -std::pair State::next_transition_guided() const +std::pair State::next_transition_guided() const { - return guide_->next_transition(); + return strategy_->next_transition(); } // This should be done in GuidedState, or at least interact with it void State::execute_next(aid_t next, RemoteApp& app) { // First, warn the guide, so it knows how to build a proper child state - guide_->execute_next(next, app); + strategy_->execute_next(next, app); // This actor is ready to be executed. Execution involves three phases: // 1. Identify the appropriate ActorState to prepare for execution // when simcall_handle will be called on it - auto& actor_state = guide_->actors_to_run_.at(next); + auto& actor_state = strategy_->actors_to_run_.at(next); const unsigned times_considered = actor_state.do_consider(); const auto* expected_executed_transition = actor_state.get_transition(times_considered); xbt_assert(expected_executed_transition != nullptr,