return std::nullopt;
}
+std::optional<ProcessSequence> Execution::get_shortest_odpor_sq_subset_insertion(const ProcessSequence& v,
+ const ExecutionSequence& w) const
+{
+ return std::nullopt;
+}
+
bool Execution::happens_before(Execution::EventHandle e1_handle, Execution::EventHandle e2_handle) const
{
// 1. "happens-before" (-->_E) is a subset of "occurs before" (<_E)
*/
std::optional<aid_t> get_first_sdpor_initial_from(EventHandle e, std::unordered_set<aid_t> backtrack_set) const;
- std::optional<ProcessSequence> get_shortest_odpor_sq_subset_insert(const ProcessSequence& v,
- const ExecutionSequence& w) const;
+ /**
+ * @brief For a given sequence of actors `v` and a sequence of transitions `w`,
+ * computes the sequence, if any, that should be inserted as a child a WakeupTree for
+ * this execution
+ */
+ std::optional<ProcessSequence> get_shortest_odpor_sq_subset_insertion(const ProcessSequence& v,
+ const ExecutionSequence& w) const;
/**
* @brief Determines the event associated with
WakeupTree::WakeupTree() : root(nullptr) {}
+WakeupTreeNode* WakeupTree::make_node(const ProcessSequence& u)
+{
+ auto node = std::unique_ptr<WakeupTreeNode>(new WakeupTreeNode(u));
+ auto* node_handle = node.get();
+ this->nodes_[node.get()] = std::move(node);
+ return node_handle;
+}
+
void WakeupTree::insert(const Execution& E, const ExecutionSequence& w)
{
+ // See section 6.2 of Abdulla. et al.'s 2017 ODPOR paper for details
+
// Find the first node `v` in the tree such that
- // `v ~_[E] w`
+ // `v ~_[E] w` and `v` is not a leaf node
+ for (WakeupTreeNode* node : *this) {
+ if (const auto shortest_sequence = E.get_shortest_odpor_sq_subset_insertion(node->get_sequence(), w);
+ shortest_sequence.has_value()) {
+ // Insert the sequence as a child of `node`, but only
+ // if the node is not already a leaf
+ if (not node->is_leaf()) {
+ WakeupTreeNode* new_node = this->make_node(shortest_sequence.value());
+ node->add_child(new_node);
+ }
+ // Since we're following the post-order traversal of the tree,
+ // the first such node we see is the smallest w.r.t "<"
+ return;
+ }
+ }
}
} // namespace simgrid::mc::odpor
\ No newline at end of file
#ifndef SIMGRID_MC_ODPOR_WAKEUP_TREE_HPP
#define SIMGRID_MC_ODPOR_WAKEUP_TREE_HPP
+#include "src/mc/explo/odpor/WakeupTreeIterator.hpp"
#include "src/mc/explo/odpor/odpor_forward.hpp"
#include <memory>
class WakeupTreeNode {
private:
+ explicit WakeupTreeNode(const ProcessSequence& u) : seq_(u) {}
+
/** An ordered list of children of for this node in the tree */
- std::list<const WakeupTreeNode*> children_;
+ std::list<WakeupTreeNode*> children_;
/** @brief The contents of the node */
ProcessSequence seq_;
+ /** Allows the owning tree to insert directly into the child */
+ friend WakeupTree;
+
public:
const auto begin() const { return this->children_.begin(); }
const auto end() const { return this->children_.end(); }
const auto rend() const { return this->children_.rend(); }
const ProcessSequence& get_sequence() const { return seq_; }
- const std::list<const WakeupTreeNode*>& get_ordered_children() const { return children_; }
+ const std::list<WakeupTreeNode*>& get_ordered_children() const { return children_; }
bool is_leaf() const { return children_.empty(); }
+
+ /** Insert a node `node` as a new child of this node */
+ void add_child(WakeupTreeNode* node) { this->children_.push_back(node); }
};
class WakeupTree {
* of the addresses that are referenced by the nodes WakeupTreeNode and Configuration.
* ODPOR guarantees that nodes are persisted as long as needed.
*/
- std::unordered_map<const WakeupTreeNode*, std::unique_ptr<WakeupTreeNode>> nodes_;
+ std::unordered_map<WakeupTreeNode*, std::unique_ptr<WakeupTreeNode>> nodes_;
+
+ /**
+ * @brief Creates a new, disconnected node in this tree
+ */
+ WakeupTreeNode* make_node(const ProcessSequence& u);
/* Allow the iterator to access the contents of the tree */
friend WakeupTreeIterator;
public:
WakeupTree();
+ ~WakeupTree() = default;
+
+ auto begin() const { return WakeupTreeIterator(*this); }
+ auto end() const { return WakeupTreeIterator(); }
/**
* @brief Inserts an sequence `seq` of processes into the tree
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "src/mc/explo/odpor/WakeupTreeIterator.hpp"
+#include "src/mc/explo/odpor/WakeupTree.hpp"
namespace simgrid::mc::odpor {
#ifndef SIMGRID_MC_ODPOR_WAKEUP_TREE_ITERATOR_HPP
#define SIMGRID_MC_ODPOR_WAKEUP_TREE_ITERATOR_HPP
-#include "src/mc/explo/odpor/WakeupTree.hpp"
+#include "src/mc/explo/odpor/odpor_forward.hpp"
#include <boost/iterator/iterator_facade.hpp>
#include <list>
namespace simgrid::mc::odpor {
struct WakeupTreeIterator
- : public boost::iterator_facade<WakeupTreeIterator, const WakeupTreeNode*, boost::forward_traversal_tag> {
+ : public boost::iterator_facade<WakeupTreeIterator, WakeupTreeNode*, boost::forward_traversal_tag> {
public:
WakeupTreeIterator() = default;
explicit WakeupTreeIterator(const WakeupTree& tree);
private:
- using node_handle = std::list<const WakeupTreeNode*>::iterator;
+ using node_handle = std::list<WakeupTreeNode*>::iterator;
/**
* @brief The current "view" of the iteration in post-order traversal
// boost::iterator_facade<...> interface to implement
void increment();
bool equal(const WakeupTreeIterator& other) const { return post_order_iteration == other.post_order_iteration; }
- const WakeupTreeNode*& dereference() const { return *post_order_iteration.top(); }
+ WakeupTreeNode*& dereference() const { return *post_order_iteration.top(); }
// Allows boost::iterator_facade<...> to function properly
friend class boost::iterator_core_access;
class Event;
class Execution;
class WakeupTree;
+class WakeupTreeNode;
class WakeupTreeIterator;
} // namespace simgrid::mc::odpor
