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
{
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");
+
+ // 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 "
+ "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());
+ 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) {
+ // TODO: Add invariant check here
+ }
+
+ wakeup_tree_.remove_min_single_process_subtree();
}
void State::mark_path_interesting_for_odpor(const odpor::PartialExecution& pe, const odpor::Execution& E)
void State::do_odpor_backtrack_cleanup()
{
if (auto out_transition = get_transition_out(); out_transition != nullptr) {
- remove_subtree_starting_with(out_transition->aid_);
+ remove_subtree_using_current_out_transition();
add_sleep_set(std::move(out_transition));
}
}
