X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c312320c2e43da49b536c51a9d19b6ad6d66e489..5f5a10db6fc4552782638abb4817041223e17775:/src/mc/api/State.cpp diff --git a/src/mc/api/State.cpp b/src/mc/api/State.cpp index b05bf39fcf..0082e67b71 100644 --- a/src/mc/api/State.cpp +++ b/src/mc/api/State.cpp @@ -5,9 +5,12 @@ #include "src/mc/api/State.hpp" #include "src/mc/api/strategy/BasicStrategy.hpp" -#include "src/mc/api/strategy/WaitStrategy.hpp" +#include "src/mc/api/strategy/MaxMatchComm.hpp" +#include "src/mc/api/strategy/MinMatchComm.hpp" +#include "src/mc/api/strategy/UniformStrategy.hpp" #include "src/mc/explo/Exploration.hpp" #include "src/mc/mc_config.hpp" +#include "xbt/random.hpp" #include #include @@ -21,21 +24,22 @@ long State::expended_states_ = 0; State::State(RemoteApp& remote_app) : num_(++expended_states_) { XBT_VERB("Creating a guide for the state"); + + if (_sg_mc_strategy == "none") strategy_ = std::make_shared(); - else if (_sg_mc_strategy == "nb_wait") - strategy_ = std::make_shared(); + else if (_sg_mc_strategy == "max_match_comm") + strategy_ = std::make_shared(); + else if (_sg_mc_strategy == "min_match_comm") + strategy_ = std::make_shared(); + else if (_sg_mc_strategy == "uniform") { + xbt::random::set_mersenne_seed(_sg_mc_random_seed); + strategy_ = std::make_shared(); + } else THROW_IMPOSSIBLE; 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, std::shared_ptr parent_state) @@ -43,36 +47,32 @@ State::State(RemoteApp& remote_app, std::shared_ptr parent_state) { if (_sg_mc_strategy == "none") strategy_ = std::make_shared(); - else if (_sg_mc_strategy == "nb_wait") - strategy_ = std::make_shared(); + else if (_sg_mc_strategy == "max_match_comm") + strategy_ = std::make_shared(); + else if (_sg_mc_strategy == "min_match_comm") + strategy_ = std::make_shared(); + else if (_sg_mc_strategy == "uniform") + strategy_ = std::make_shared(); else THROW_IMPOSSIBLE; - *strategy_ = *(parent_state->strategy_); + strategy_->copy_from(parent_state_->strategy_.get()); 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 - - /* If we want sleep set reduction, copy the sleep set and eventually removes things from it */ - if (_sg_mc_sleep_set) { - /* For each actor in the previous sleep set, keep it if it is not dependent with current transition. - * 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 incoming_transition_->depends(transition.get())) { - sleep_set_.try_emplace(aid, transition); - if (strategy_->actors_to_run_.count(aid) != 0) { - XBT_DEBUG("Actor %ld will not be explored, for it is in the sleep set", aid); - strategy_->actors_to_run_.at(aid).mark_done(); - } - } else - XBT_DEBUG("Transition >>%s<< removed from the sleep set because it was dependent with incoming >>%s<<", - transition->to_string().c_str(), incoming_transition_->to_string().c_str()); - } + /* Copy the sleep set and eventually removes things from it: */ + /* For each actor in the previous sleep set, keep it if it is not dependent with current transition. + * 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 (const auto& [aid, transition] : parent_state_->get_sleep_set()) { + if (not incoming_transition_->depends(transition.get())) { + sleep_set_.try_emplace(aid, transition); + if (strategy_->actors_to_run_.count(aid) != 0) { + XBT_DEBUG("Actor %ld will not be explored, for it is in the sleep set", aid); + strategy_->actors_to_run_.at(aid).mark_done(); + } + } else + XBT_DEBUG("Transition >>%s<< removed from the sleep set because it was dependent with incoming >>%s<<", + transition->to_string().c_str(), incoming_transition_->to_string().c_str()); } } @@ -170,7 +170,7 @@ std::unordered_set State::get_backtrack_set() const { std::unordered_set actors; for (const auto& [aid, state] : get_actors_list()) { - if (state.is_todo() or state.is_done()) { + if (state.is_todo() || state.is_done()) { actors.insert(aid); } } @@ -235,12 +235,12 @@ void State::sprout_tree_from_parent_state() "deciding when to make subtrees in ODPOR is incorrect"); xbt_assert((get_transition_in()->aid_ == min_process_node.value()->get_actor()) && (get_transition_in()->type_ == min_process_node.value()->get_action()->type_), - "We tried to make a subtree from a parent state who claimed to have executed `%s` " - "but whose wakeup tree indicates it should have executed `%s`. This indicates " + "We tried to make a subtree from a parent state who claimed to have executed `%s` on actor %ld" + "but whose wakeup tree indicates it should have executed `%s` on actor %ld. This indicates " "that exploration is not following ODPOR. Are you sure you're choosing actors " "to schedule from the wakeup tree?", - get_transition_in()->to_string(false).c_str(), - min_process_node.value()->get_action()->to_string(false).c_str()); + get_transition_in()->to_string(false).c_str(), get_transition_in()->aid_, + min_process_node.value()->get_action()->to_string(false).c_str(), min_process_node.value()->get_actor()); this->wakeup_tree_ = odpor::WakeupTree::make_subtree_rooted_at(min_process_node.value()); } @@ -278,7 +278,7 @@ void State::do_odpor_unwind() // works with ODPOR in the way we intend it to work. There is not a // good way to perform transition equality in SimGrid; instead, we // effectively simply check for the presence of an actor in the sleep set. - if (!get_actors_list().at(out_transition->aid_).has_more_to_consider()) + if (not get_actors_list().at(out_transition->aid_).has_more_to_consider()) add_sleep_set(std::move(out_transition)); } }