X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/585a65d8e2c5bed10f20cd84c5c1cb59ef6adc8a..ed6a950d6bed7669f5bfe968f46d5a951d40e9a7:/src/mc/api/State.hpp diff --git a/src/mc/api/State.hpp b/src/mc/api/State.hpp index 7709cc1e81..e60e547b36 100644 --- a/src/mc/api/State.hpp +++ b/src/mc/api/State.hpp @@ -21,15 +21,11 @@ namespace simgrid::mc { class XBT_PRIVATE State : public xbt::Extendable { static long expended_states_; /* Count total amount of states, for stats */ - /** - * @brief The outgoing transition: what was the last transition that we took to leave this state? - * - * The owner of the transition is the `ActorState` instance which exists in this state. - */ - Transition* transition_ = nullptr; + /** @brief The outgoing transition is the last transition that we took to leave this state. */ + std::shared_ptr outgoing_transition_ = nullptr; - /** @brief A list of transition to be replayed in order to get in this state. */ - std::list recipe_; + /** @brief The incoming transition is what led to this state, coming from its parent */ + std::shared_ptr incoming_transition_ = nullptr; /** Sequential state ID (used for debugging) */ long num_ = 0; @@ -58,9 +54,11 @@ public: internal cost of the transition is returned */ std::pair next_transition_guided() const; - /* Explore a new path on the remote app; the parameter 'next' must be the result of a previous call to - * next_transition() */ - void execute_next(aid_t next, RemoteApp& app); + /** + * @brief Explore a new path on the remote app; the parameter 'next' must be the result of a previous call to + * next_transition() + */ + std::shared_ptr execute_next(aid_t next, RemoteApp& app); long get_num() const { return num_; } std::size_t count_todo() const; @@ -75,10 +73,9 @@ public: unsigned long consider_all() const { return strategy_->consider_all(); } bool is_actor_done(aid_t actor) const { return strategy_->actors_to_run_.at(actor).is_done(); } - Transition* get_transition() const; - void set_transition(Transition* t) { transition_ = t; } + std::shared_ptr get_transition_out() const { return outgoing_transition_; } + std::shared_ptr get_transition_in() const { return incoming_transition_; } std::shared_ptr get_parent_state() const { return parent_state_; } - std::list get_recipe() const { return recipe_; } std::map const& get_actors_list() const { return strategy_->actors_to_run_; } @@ -89,7 +86,7 @@ public: void set_system_state(std::shared_ptr state) { system_state_ = std::move(state); } std::map const& get_sleep_set() const { return sleep_set_; } - void add_sleep_set(const Transition* t) + void add_sleep_set(std::shared_ptr t) { sleep_set_.insert_or_assign(t->aid_, Transition(t->type_, t->aid_, t->times_considered_)); }