X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/edc5c089fec77e74e39c8887a640fe03226d8a3f..6260d187764dc644d699e1a53454f7efdcc682df:/src/mc/api/State.cpp diff --git a/src/mc/api/State.cpp b/src/mc/api/State.cpp index 298913153a..007b1799a9 100644 --- a/src/mc/api/State.cpp +++ b/src/mc/api/State.cpp @@ -5,7 +5,9 @@ #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" @@ -21,10 +23,17 @@ long State::expended_states_ = 0; State::State(RemoteApp& remote_app) : num_(++expended_states_) { XBT_VERB("Creating a guide for the state"); + + srand(_sg_mc_random_seed); + 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; @@ -41,13 +50,18 @@ State::State(RemoteApp& remote_app) : num_(++expended_states_) State::State(RemoteApp& remote_app, std::shared_ptr parent_state) : incoming_transition_(parent_state->get_transition_out()), num_(++expended_states_), parent_state_(parent_state) { - if (_sg_mc_strategy == "none") + + 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_); @@ -63,16 +77,15 @@ State::State(RemoteApp& remote_app, std::shared_ptr parent_state) * 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)) { + 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()); + transition->to_string().c_str(), incoming_transition_->to_string().c_str()); } } } @@ -209,9 +222,17 @@ void State::seed_wakeup_tree_if_needed(const odpor::Execution& prior) // tree and decided upon "happens-before" at that point for different // executions :( if (wakeup_tree_.empty()) { - strategy_->consider_best(); - if (const aid_t next = std::get<0>(strategy_->next_transition()); next >= 0) { - wakeup_tree_.insert(prior, odpor::PartialExecution{strategy_->actors_to_run_.at(next).get_transition()}); + // Find an enabled transition to pick + for (const auto& [_, actor] : get_actors_list()) { + if (actor.is_enabled()) { + // For each variant of the transition, we want + // to insert the action into the tree. This ensures + // that all variants are searched + for (unsigned times = 0; times < actor.get_max_considered(); ++times) { + wakeup_tree_.insert(prior, odpor::PartialExecution{actor.get_transition(times)}); + } + break; // Only one actor gets inserted (see pseudocode) + } } } has_initialized_wakeup_tree = true; @@ -226,39 +247,53 @@ void State::sprout_tree_from_parent_state() "parent with an empty wakeup tree. This indicates either that ODPOR " "actor selection in State.cpp is incorrect, or that the code " "deciding when to make subtrees in ODPOR is incorrect"); - - // TODO: This assert should even be bolstered to check that the - // the transitions themselves are identical -- not only just - // that the actors are the same. When we have to consider - // multiple paths for a transition, things get trickier - xbt_assert(parent_state_->get_transition_out()->aid_ == min_process_node.value()->get_actor(), - "We tried to make a subtree from a parent state who claimed to have executed %ld " - "but whose wakeup tree indicates it should have executed %ld. This indicates " + 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 " "that exploration is not following ODPOR. Are you sure you're choosing actors " "to schedule from the wakeup tree?", - parent_state_->get_transition_out()->aid_, min_process_node.value()->get_actor()); + get_transition_in()->to_string(false).c_str(), + min_process_node.value()->get_action()->to_string(false).c_str()); this->wakeup_tree_ = odpor::WakeupTree::make_subtree_rooted_at(min_process_node.value()); } void State::remove_subtree_using_current_out_transition() { if (auto out_transition = get_transition_out(); out_transition != nullptr) { - // TODO: Add invariant check here + if (const auto min_process_node = wakeup_tree_.get_min_single_process_node(); min_process_node.has_value()) { + xbt_assert((out_transition->aid_ == min_process_node.value()->get_actor()) && + (out_transition->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 " + "that exploration is not following ODPOR. Are you sure you're choosing actors " + "to schedule from the wakeup tree?", + out_transition->to_string(false).c_str(), + min_process_node.value()->get_action()->to_string(false).c_str()); + } } - wakeup_tree_.remove_min_single_process_subtree(); } -void State::mark_path_interesting_for_odpor(const odpor::PartialExecution& pe, const odpor::Execution& E) +odpor::WakeupTree::InsertionResult State::insert_into_wakeup_tree(const odpor::PartialExecution& pe, + const odpor::Execution& E) { - this->wakeup_tree_.insert(E, pe); + return this->wakeup_tree_.insert(E, pe); } -void State::do_odpor_backtrack_cleanup() +void State::do_odpor_unwind() { if (auto out_transition = get_transition_out(); out_transition != nullptr) { remove_subtree_using_current_out_transition(); - add_sleep_set(std::move(out_transition)); + + // Only when we've exhausted all variants of the transition which + // can be chosen from this state do we finally add the actor to the + // sleep set. This ensures that the current logic handling sleep sets + // 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()) + add_sleep_set(std::move(out_transition)); } }