Rename SIMGRID_HAVE_MC into SIMGRID_HAVE_STATEFUL_MC (so that MC can be optional...

[simgrid.git] / src / mc / api / State.hpp

diff --git a/src/mc/api/State.hpp b/src/mc/api/State.hpp
index 680f086..2b2a625 100644 (file)
--- a/src/mc/api/State.hpp
+++ b/src/mc/api/State.hpp
@@ -8,10 +8,13 @@
 
 #include "src/mc/api/ActorState.hpp"
 #include "src/mc/api/RemoteApp.hpp"
-#include "src/mc/api/guide/GuidedState.hpp"
-#include "src/mc/sosp/Snapshot.hpp"
+#include "src/mc/api/strategy/Strategy.hpp"
 #include "src/mc/transition/Transition.hpp"
 
+#if SIMGRID_HAVE_STATEFUL_MC
+#include "src/mc/sosp/Snapshot.hpp"
+#endif
+
 namespace simgrid::mc {
 
 /* A node in the exploration graph (kind-of) */
@@ -33,6 +36,9 @@ class XBT_PRIVATE State : public xbt::Extendable<State> {
    */
   Transition* transition_ = default_transition_.get();
 
+  /** @brief A list of transition to be replayed in order to get in this state. */
+  std::list<Transition*> recipe_;
+
   /** Sequential state ID (used for debugging) */
   long num_ = 0;
 
@@ -41,9 +47,9 @@ class XBT_PRIVATE State : public xbt::Extendable<State> {
 
   /** Unique parent of this state. Required both for sleep set computation
       and for guided model-checking */
-  const State* parent_state_;
+  std::shared_ptr<State> parent_state_ = nullptr;
 
-  std::shared_ptr<GuidedState> guide_;
+  std::shared_ptr<Strategy> strategy_;
 
   /* Sleep sets are composed of the actor and the corresponding transition that made it being added to the sleep
    * set. With this information, it is check whether it should be removed from it or not when exploring a new
@@ -52,8 +58,7 @@ class XBT_PRIVATE State : public xbt::Extendable<State> {
 
 public:
   explicit State(RemoteApp& remote_app);
-  explicit State(RemoteApp& remote_app, const State* parent_state);
-  explicit State(const State& other);
+  explicit State(RemoteApp& remote_app, std::shared_ptr<State> parent_state);
   /* Returns a positive number if there is another transition to pick, or -1 if not */
   aid_t next_transition() const; // this function should disapear as it is redundant with the next one
 
@@ -73,17 +78,20 @@ public:
    *  + consider_one mark aid actor (and assert it is possible)
    *  + consider_best ensure one actor is marked by eventually marking the best regarding its guiding methode
    *  + conside_all mark all enabled actor that are not done yet */
-  void consider_one(aid_t aid) { guide_->consider_one(aid); }
-  void consider_best() { guide_->consider_best(); }
-  unsigned long consider_all() { return guide_->consider_all(); }
+  void consider_one(aid_t aid) { strategy_->consider_one(aid); }
+  void consider_best() { strategy_->consider_best(); }
+  unsigned long consider_all() { return strategy_->consider_all(); }
 
-  bool is_actor_done(aid_t actor) const { return guide_->actors_to_run_.at(actor).is_done(); }
+  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::map<aid_t, ActorState> const& get_actors_list() const { return guide_->actors_to_run_; }
+  std::shared_ptr<State> get_parent_state() { return parent_state_; }
+  std::list<Transition*> get_recipe() const { return recipe_; }
+
+  std::map<aid_t, ActorState> const& get_actors_list() const { return strategy_->actors_to_run_; }
 
-  unsigned long get_actor_count() const { return guide_->actors_to_run_.size(); }
-  bool is_actor_enabled(aid_t actor) { return guide_->actors_to_run_.at(actor).is_enabled(); }
+  unsigned long get_actor_count() const { return strategy_->actors_to_run_.size(); }
+  bool is_actor_enabled(aid_t actor) { return strategy_->actors_to_run_.at(actor).is_enabled(); }
 
   Snapshot* get_system_state() const { return system_state_.get(); }
   void set_system_state(std::shared_ptr<Snapshot> state) { system_state_ = std::move(state); }