X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/222bdffb8f8c4d7e5660c049c2c2bdadd8f7cc07..6260d187764dc644d699e1a53454f7efdcc682df:/src/mc/explo/odpor/Execution.hpp diff --git a/src/mc/explo/odpor/Execution.hpp b/src/mc/explo/odpor/Execution.hpp index fc75fa997a..f3bd7eddb1 100644 --- a/src/mc/explo/odpor/Execution.hpp +++ b/src/mc/explo/odpor/Execution.hpp @@ -8,6 +8,8 @@ #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 @@ -17,25 +19,26 @@ namespace simgrid::mc::odpor { -using ProcessSequence = std::list; -using ExecutionSequence = std::list; -using Hypothetical = ExecutionSequence; +std::vector get_textual_trace(const PartialExecution& w); /** * @brief The occurrence of a transition in an execution + * + * An execution is set of *events*, where each element represents + * the occurrence or execution of the `i`th step of a particular + * actor `j` */ class Event { - std::pair contents_; + std::pair, ClockVector> contents_; public: Event() = default; Event(Event&&) = default; Event(const Event&) = default; Event& operator=(const Event&) = default; + explicit Event(std::pair, ClockVector> pair) : contents_(std::move(pair)) {} - explicit Event(std::pair pair) : contents_(std::move(pair)) {} - - const Transition* get_transition() const { return std::get<0>(contents_); } + std::shared_ptr get_transition() const { return std::get<0>(contents_); } const ClockVector& get_clock_vector() const { return std::get<1>(contents_); } }; @@ -57,8 +60,16 @@ public: * In addition to representing an actual steps taken, * an execution keeps track of the "happens-before" * relation among the transitions in the execution - * by following the procedure outlined in the - * original DPOR paper with clock vectors + * by following the procedure outlined in section 4 of the + * original DPOR paper with clock vectors. + * As new transitions are added to the execution, clock vectors are + * computed as appropriate and associated with the corresponding position + * in the execution. This allows us to determine “happens-before” in + * constant-time between points in the execution (called events + * [which is unfortunately the same name used in UDPOR for a slightly + * different concept]), albeit for an up-front cost of traversing the + * execution stack. The happens-before relation is important in many + * places in SDPOR and ODPOR. * * @note: For more nuanced happens-before relations, clock * vectors may not always suffice. Clock vectors work @@ -73,39 +84,166 @@ public: */ class Execution { private: - /** - * @brief The actual steps that are taken by the process - * during exploration, relative to the - */ std::vector contents_; + Execution(std::vector&& contents) : contents_(std::move(contents)) {} public: - using Handle = decltype(contents_)::const_iterator; using EventHandle = uint32_t; Execution() = default; Execution(const Execution&) = default; Execution& operator=(Execution const&) = default; Execution(Execution&&) = default; + Execution(const PartialExecution&); + + std::vector get_textual_trace() const; - Execution(ExecutionSequence&& seq, std::optional base = {}); - Execution(const ExecutionSequence& seq, std::optional base = {}); + size_t size() const { return this->contents_.size(); } + bool empty() const { return this->contents_.empty(); } + auto begin() const { return this->contents_.begin(); } + auto end() const { return this->contents_.end(); } + + /** + * @brief Computes the "core" portion the SDPOR algorithm, + * viz. the intersection of the backtracking set and the + * 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 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::unordered_set get_missing_source_set_actors_from(EventHandle e, + const std::unordered_set& backtrack_set) const; - std::unordered_set get_initials_after(const Hypothetical& w) const; - std::unordered_set get_weak_initials_after(const Hypothetical& w) const; + /** + * @brief Computes the analogous lines from the SDPOR algorithm + * in the ODPOR algorithm, viz. the intersection of the slee set + * and the set of weak initials with respect to the given pair + * of racing events + * + * This method computes lines 4-6 of the ODPOR pseudocode, viz.: + * + * 4 | let E' := pre(E, e) + * 5 | let v := notdep(e, E).e'^ + * 6 | if sleep(E') ∩ WI_[E'](v) = empty then ... + * + * The sequence `v` is computed and returned as needed, based on whether + * the check on line 6 passes. + * + * @invariant: This method assumes that events `e` and + * `e_prime` are in a *reversible* race as is the case + * in ODPOR + */ + std::optional get_odpor_extension_from(EventHandle e, EventHandle e_prime, + const State& state_at_e) 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 in wakeup tree for + * this execution + * + * Recall that the procedure for implementing the insertion + * is outlined in section 6.2 of Abdulla et al. 2017 as follows: + * + * | Let `v` be the smallest (w.r.t to "<") sequence in [the tree] B + * | such that `v ~_[E] w`. If `v` is a leaf node, the tree can be left + * | unmodified. + * | + * | Otherwise let `w'` be the shortest sequence such that `w [=_[E] v.w'` + * | and add `v.w'` as a new leaf, ordered after all already existing nodes + * | of the form `v.w''` + * + * This method computes the result `v.w'` as needed (viz. only if `v ~_[E] w` + * with respect to this execution `E`) + * + * The procedure for determining `v ~_[E] w` is given as Lemma 4.6 of + * Abdulla et al. 2017: + * + * | The relation `v ~_[E] w` holds if either + * | (1) v = <>, or + * | (2) v := p.v' and either + * | (a) p in I_[E](w) and `v' ~_[E.p] (w \ p)` + * | (b) E ⊢ p ◊ w and `v' ~_[E.p] w` + * + * @invariant: This method assumes that `E.v` is a valid execution, viz. + * that the events of `E` are sufficient to enabled `v_0` and that + * `v_0, ..., v_{i - 1}` are sufficient to enable `v_i`. This is the + * case when e.g. `v := notdep(e, E).p` for example in ODPOR + * + * @returns a partial execution `w'` that should be inserted + * as a child of a wakeup tree node with the associated sequence `v`. + */ + std::optional get_shortest_odpor_sq_subset_insertion(const PartialExecution& v, + const PartialExecution& w) const; + + /** + * @brief For a given sequence `w`, determines whether p in I_[E](w) + * + * @note: You may notice that some of the other methods compute this + * value as well. What we notice, though, in those cases is that + * we are repeatedly asking about initials with respect to an execution. + * It is better, then, to bunch the work together in those cases to + * get asymptotically better results (e.g. instead of calling with all + * `N` actors, we can process them "in-parallel" as is done with the + * computation of SDPOR initials) + */ + bool is_initial_after_execution_of(const PartialExecution& w, aid_t p) const; - bool is_initial(aid_t p, const Hypothetical& w) const; - bool is_weak_initial(aid_t p, const Hypothetical& w) const; + /** + * @brief Determines whether `E ⊢ p ◊ w` given the next action taken by `p` + */ + bool is_independent_with_execution_of(const PartialExecution& w, std::shared_ptr next_E_p) const; + /** + * @brief Determines the event associated with + * the given handle `handle` + */ const Event& get_event_with_handle(EventHandle handle) const { return contents_[handle]; } + + /** + * @brief Determines the actor associated with + * the given event handle `handle` + */ aid_t get_actor_with_handle(EventHandle handle) const { return get_event_with_handle(handle).get_transition()->aid_; } /** - * @brief Returns a set of IDs of events which are in - * "immediate conflict" (according to the definition given - * in the ODPOR paper) with one another + * @brief Determines the transition associated with the given handle `handle` */ - std::unordered_set get_racing_events_of(EventHandle) const; + const Transition* get_transition_for_handle(EventHandle handle) const + { + return get_event_with_handle(handle).get_transition().get(); + } /** * @brief Returns a handle to the newest event of the execution, @@ -116,7 +254,57 @@ public: return contents_.empty() ? std::nullopt : std::optional{static_cast(size() - 1)}; } - Execution get_prefix_up_to(EventHandle); + /** + * @brief Returns a set of events which are in + * "immediate conflict" (according to the definition given + * in the ODPOR paper) with the given event + * + * Two events `e` and `e'` in an execution `E` are said to + * race iff + * + * 1. `proc(e) != proc(e')`; that is, the events correspond to + * the execution of different actors + * 2. `e -->_E e'` and there is no `e''` in `E` such that + * `e -->_E e''` and `e'' -->_E e'`; that is, the two events + * "happen-before" one another in `E` and no other event in + * `E` "happens-between" `e` and `e'` + * + * @param handle the event with respect to which races are + * computed + * @returns a set of event handles from which race with `handle` + */ + std::unordered_set get_racing_events_of(EventHandle handle) const; + + /** + * @brief Returns a set of events which are in a reversible + * race with the given event handle `handle` + * + * Two events `e` and `e'` in an execution `E` are said to + * be in a reversible race iff + * + * 1. `e` and `e'` race + * 2. In any equivalent execution sequence `E'` to `E` + * where `e` occurs immediately before `e'`, the actor + * running `e'` was enabled in the state prior to `e` + * + * @param handle the event with respect to which + * reversible races are computed + * @returns a set of event handles from which are in a reversible + * race with `handle` + */ + std::unordered_set get_reversible_races_of(EventHandle handle) const; + + /** + * @brief Computes `pre(e, E)` as described in ODPOR [1] + * + * The execution `pre(e, E)` for an event `e` in an + * execution `E` is the contiguous prefix of events + * `E' <= E` up to by excluding the event `e` itself. + * The prefix intuitively represents the "history" of + * causes that permitted event `e` to exist (roughly + * speaking) + */ + Execution get_prefix_before(EventHandle) const; /** * @brief Whether the event represented by `e1` @@ -129,18 +317,14 @@ public: * `e1 --->_E e2` * * where `E` is this execution - */ - 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 + * @note: The happens-before relation computed by this + * execution is "coarse" in the sense that context-sensitive + * independence is not exploited. To include such context-sensitive + * dependencies requires a new method of keeping track of + * the happens-before procedure, which is nontrivial... */ - void pop_latest(); + bool happens_before(EventHandle e1, EventHandle e2) const; /** * @brief Extends the execution by one more step @@ -150,12 +334,12 @@ public: * 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); /** - * @brief The total number of steps contained in the execution + * @brief Extends the execution by a sequence of steps */ - size_t size() const { return this->contents_.size(); } + void push_partial_execution(const PartialExecution&); }; } // namespace simgrid::mc::odpor