#include "src/mc/api/ClockVector.hpp"
#include "src/mc/explo/odpor/odpor_forward.hpp"
+#include "src/mc/mc_forward.hpp"
+#include "src/mc/mc_record.hpp"
#include "src/mc/transition/Transition.hpp"
#include <list>
namespace simgrid::mc::odpor {
-using ProcessSequence = std::list<aid_t>;
-using ExecutionSequence = std::list<const State*>;
-using Hypothetical = ExecutionSequence;
-
/**
* @brief The occurrence of a transition in an execution
*
* actor `j`
*/
class Event {
- std::pair<const Transition*, ClockVector> contents_;
+ std::pair<std::shared_ptr<Transition>, ClockVector> contents_;
public:
Event() = default;
Event(Event&&) = default;
Event(const Event&) = default;
Event& operator=(const Event&) = default;
- explicit Event(std::pair<const Transition*, ClockVector> pair) : contents_(std::move(pair)) {}
+ explicit Event(std::pair<std::shared_ptr<Transition>, ClockVector> pair) : contents_(std::move(pair)) {}
- const Transition* get_transition() const { return std::get<0>(contents_); }
+ std::shared_ptr<Transition> get_transition() const { return std::get<0>(contents_); }
const ClockVector& get_clock_vector() const { return std::get<1>(contents_); }
};
*/
class Execution {
private:
- /**
- * @brief The actual steps that are taken by the process
- * during exploration, relative to the
- */
std::vector<Event> contents_;
-
Execution(std::vector<Event>&& contents) : contents_(std::move(contents)) {}
public:
Execution(const Execution&) = default;
Execution& operator=(Execution const&) = default;
Execution(Execution&&) = default;
- Execution(ExecutionSequence&& seq);
- Execution(const ExecutionSequence& seq);
size_t size() const { return this->contents_.size(); }
bool empty() const { return this->contents_.empty(); }
/**
* @brief Computes the "core" portion the SDPOR algorithm,
* viz. the intersection of the backtracking set and the
- * set of initials with respect to the end
+ * set of initials with respect to the *last* event added
+ * to the execution
+ *
+ * The "core" portion of the SDPOR algorithm is found on
+ * lines 6-9 of the pseudocode:
+ *
+ * 6 | let E' := pre(E, e)
+ * 7 | let v := notdep(e, E).p
+ * 8 | if I_[E'](v) ∩ backtrack(E') = empty then
+ * 9 | --> add some q in I_[E'](v) to backtrack(E')
+ *
+ * This method computes all of the lines simultaneously,
+ * returning some actor `q` if it passes line 8 and exists.
+ * The event `e` and the set `backtrack(E')` are the provided
+ * arguments to the method.
+ *
+ * @param e the event with respect to which to determine
+ * whether a backtrack point needs to be added for the
+ * prefix corresponding to the execution prior to `e`
+ *
+ * @param backtrack_set The set of actors which should
+ * not be considered for selection as an SDPOR initial.
+ * While this set need not necessarily correspond to the
+ * backtrack set `backtrack(E')`, doing so provides what
+ * is expected for SDPOR
*
* See the SDPOR algorithm pseudocode in [1] for more
* details for the context of the function.
*
* @invariant: This method assumes that events `e` and
* `e' := get_latest_event_handle()` are in a *reversible* race
- * as is the case in SDPOR
+ * as is explicitly the case in SDPOR
*
* @returns an actor not contained in `disqualified` which
* can serve as an initial to reverse the race between `e`
* and `e'`
*/
- std::optional<aid_t> get_first_sdpor_initial_from(EventHandle e, std::unordered_set<aid_t> disqualified) const;
+ std::optional<aid_t> get_first_sdpor_initial_from(EventHandle e, std::unordered_set<aid_t> backtrack_set) 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 wakeup tree for
+ * this execution
+ */
+ std::optional<PartialExecution> get_shortest_odpor_sq_subset_insertion(const PartialExecution& v,
+ const PartialExecution& w) const;
+
+ /**
+ * @brief For a given reversible race
+ *
+ * @invariant: This method assumes that events `e` and
+ * `e_prime` are in a *reversible* race as is the case
+ * in ODPOR
+ */
+ std::optional<PartialExecution> get_odpor_extension_from(EventHandle e, EventHandle e_prime,
+ const State& state_at_e) const;
+
+ bool is_initial_after_execution(const PartialExecution& w, aid_t p) const;
+ bool is_independent_with_execution(const PartialExecution& w, std::shared_ptr<Transition> next_E_p) const;
/**
* @brief Determines the event associated with
*/
aid_t get_actor_with_handle(EventHandle handle) const { return get_event_with_handle(handle).get_transition()->aid_; }
+ /**
+ * @brief Returns a handle to the newest event of the execution,
+ * if such an event exists
+ */
+ std::optional<EventHandle> get_latest_event_handle() const
+ {
+ return contents_.empty() ? std::nullopt : std::optional<EventHandle>{static_cast<EventHandle>(size() - 1)};
+ }
+
/**
* @brief Returns a set of events which are in
* "immediate conflict" (according to the definition given
*/
std::unordered_set<EventHandle> get_racing_events_of(EventHandle handle) const;
- /**
- * @brief Returns a handle to the newest event of the execution,
- * if such an event exists
- */
- std::optional<EventHandle> get_latest_event_handle() const
- {
- return contents_.empty() ? std::nullopt : std::optional<EventHandle>{static_cast<EventHandle>(size() - 1)};
- }
-
/**
* @brief Computes `pre(e, E)` as described in ODPOR [1]
*
* causes that permitted event `e` to exist (roughly
* speaking)
*/
- Execution get_prefix_up_to(EventHandle) const;
+ Execution get_prefix_before(EventHandle) const;
/**
* @brief Whether the event represented by `e1`
*/
bool happens_before(EventHandle e1, EventHandle e2) const;
- /**
- * @brief Removes the last event of the execution,
- * if such an event exists
- *
- * @note: When you remove events from an execution, any views
- * of the execution referring to those removed events
- * become invalidated
- */
- void pop_latest();
-
/**
* @brief Extends the execution by one more step
*
* notation of [1]) `E.proc(t)` where `proc(t)` is the
* actor which executed transition `t`.
*/
- void push_transition(const Transition*);
+ void push_transition(std::shared_ptr<Transition>);
};
} // namespace simgrid::mc::odpor