X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7dad93f4a344162a5577f07c6f4e36357c26ac05..b1233a583739b02023186b2a129805eb6594a4d5:/src/mc/api/State.cpp?ds=sidebyside diff --git a/src/mc/api/State.cpp b/src/mc/api/State.cpp index 174e1b992d..b05bf39fcf 100644 --- a/src/mc/api/State.cpp +++ b/src/mc/api/State.cpp @@ -63,16 +63,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()); } } } @@ -122,17 +121,7 @@ std::pair State::next_transition_guided() const aid_t State::next_odpor_transition() const { - const auto first_single_process_branch = - std::find_if(wakeup_tree_.begin(), wakeup_tree_.end(), - [=](const odpor::WakeupTreeNode* node) { return node->is_single_process(); }); - if (first_single_process_branch != wakeup_tree_.end()) { - const auto* wakeup_tree_node = *first_single_process_branch; - xbt_assert(wakeup_tree_node->get_sequence().size() == 1, "We claimed that the selected branch " - "contained only a single process, yet more " - "than one process was actually contained in it :("); - return wakeup_tree_node->get_first_actor(); - } - return -1; + return wakeup_tree_.get_min_single_process_actor().value_or(-1); } // This should be done in GuidedState, or at least interact with it @@ -219,9 +208,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; @@ -231,42 +228,58 @@ void State::sprout_tree_from_parent_state() { xbt_assert(parent_state_ != nullptr, "Attempting to construct a wakeup tree for the root state " "(or what appears to be, rather for state without a parent defined)"); - const auto p = parent_state_->get_transition_out()->aid_; - const auto branch = std::find_if( - parent_state_->wakeup_tree_.begin(), parent_state_->wakeup_tree_.end(), - [=](const odpor::WakeupTreeNode* node) { return node->is_single_process() && node->get_first_actor() == p; }); - xbt_assert(branch != parent_state_->wakeup_tree_.end(), - "Attempted to create a subtree from the wakeup tree of the parent " - "state using actor `%ld`, but no such subtree could be found. " - "This implies that the wakeup tree management is broken, " - "and more specifically that subtree formation is not working " - "as intended; for if this state was generated by the parent " - "having taken an action by actor `%ld`, this implies that " - "ODPOR found `%ld` as a candidate branch prior", - p, p, p); - this->wakeup_tree_ = odpor::WakeupTree::make_subtree_rooted_at(*branch); + const auto min_process_node = parent_state_->wakeup_tree_.get_min_single_process_node(); + xbt_assert(min_process_node.has_value(), "Attempting to construct a subtree for a substate from a " + "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"); + 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?", + 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_starting_with(aid_t p) +void State::remove_subtree_using_current_out_transition() { - const auto branch = std::find_if(wakeup_tree_.begin(), wakeup_tree_.end(), [=](const odpor::WakeupTreeNode* node) { - return node->is_single_process() && node->get_first_actor() == p; - }); - xbt_assert(branch != wakeup_tree_.end(), "Attempted to remove a subtree of this state's " - "wakeup tree that does not exist"); - this->wakeup_tree_.remove_subtree_rooted_at(*branch); + if (auto out_transition = get_transition_out(); out_transition != nullptr) { + 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_starting_with(out_transition->aid_); - add_sleep_set(std::move(out_transition)); + remove_subtree_using_current_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)); } }