X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3c356a0c1805437c7d7bfa8890f257c1e5926161..239cd16f4e95031d3a106e487c1485726069f1d7:/src/mc/api/State.cpp

diff --git a/src/mc/api/State.cpp b/src/mc/api/State.cpp
index a9d97afd1b..90045f501b 100644
--- a/src/mc/api/State.cpp
+++ b/src/mc/api/State.cpp
@@ -4,6 +4,7 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "src/mc/api/State.hpp"
+#include "src/mc/explo/Exploration.hpp"
 #include "src/mc/mc_config.hpp"
 
 #include <boost/range/algorithm.hpp>
@@ -14,45 +15,47 @@ namespace simgrid::mc {
 
 long State::expended_states_ = 0;
 
-State::State(const RemoteApp& remote_app) : num_(++expended_states_)
+State::State(RemoteApp& remote_app) : num_(++expended_states_)
 {
   remote_app.get_actors_status(actors_to_run_);
 
   /* Stateful model checking */
-  if ((_sg_mc_checkpoint > 0 && (num_ % _sg_mc_checkpoint == 0)) || _sg_mc_termination) {
-    system_state_ = std::make_shared<simgrid::mc::Snapshot>(num_);
-  }
+  if ((_sg_mc_checkpoint > 0 && (num_ % _sg_mc_checkpoint == 0)) || _sg_mc_termination)
+    system_state_ = std::make_shared<simgrid::mc::Snapshot>(num_, remote_app.get_page_store(),
+                                                            remote_app.get_remote_process_memory());
 }
 
-State::State(const RemoteApp& remote_app, const State* previous_state)
-    : default_transition_(std::make_unique<Transition>()), num_(++expended_states_)
+State::State(RemoteApp& remote_app, const State* parent_state)
+    :  num_(++expended_states_), parent_state_(parent_state)
 {
 
   remote_app.get_actors_status(actors_to_run_);
 
-  transition_ = default_transition_.get();
-
   /* Stateful model checking */
-  if ((_sg_mc_checkpoint > 0 && (num_ % _sg_mc_checkpoint == 0)) || _sg_mc_termination) {
-    system_state_ = std::make_shared<simgrid::mc::Snapshot>(num_);
-  }
-
-  /* For each actor in the previous sleep set, keep it if it is not dependent with current transition.
-   * And if we kept it and the actor is enabled in this state, mark the actor as already done, so that
-   * it is not explored*/
-  for (auto& [aid, transition] : previous_state->get_sleep_set()) {
-
-    if (not previous_state->get_transition()->depends(&transition)) {
-
-      sleep_set_.emplace(aid, transition);
-      if (actors_to_run_.count(aid) != 0) {
-        XBT_DEBUG("Actor %ld will not be explored, for it is in the sleep set", aid);
-
-        actors_to_run_.at(aid).mark_done();
+  if ((_sg_mc_checkpoint > 0 && (num_ % _sg_mc_checkpoint == 0)) || _sg_mc_termination)
+    system_state_ = std::make_shared<simgrid::mc::Snapshot>(num_, remote_app.get_page_store(),
+                                                            remote_app.get_remote_process_memory());
+
+  
+  /* If we want sleep set reduction, copy the sleep set and eventually removes things from it */ 
+  if (_sg_mc_sleep_set) {      
+      /* For each actor in the previous sleep set, keep it if it is not dependent with current transition.
+       * And if we kept it and the actor is enabled in this state, mark the actor as already done, so that
+       * it is not explored*/
+      for (auto& [aid, transition] : parent_state_->get_sleep_set()) {
+
+	  if (not parent_state_->get_transition()->depends(&transition)) {
+
+	      sleep_set_.emplace(aid, transition);
+	      if (actors_to_run_.count(aid) != 0) {
+		  XBT_DEBUG("Actor %ld will not be explored, for it is in the sleep set", aid);
+
+		  actors_to_run_.at(aid).mark_done();
+	      }
+	  } else
+	      XBT_DEBUG("Transition >>%s<< removed from the sleep set because it was dependent with >>%s<<",
+			transition.to_string().c_str(), parent_state_->get_transition()->to_string().c_str());
       }
-    } else
-      XBT_DEBUG("Transition >>%s<< removed from the sleep set because it was dependent with >>%s<<",
-                transition.to_string().c_str(), previous_state->get_transition()->to_string().c_str());
   }
 }
 
@@ -61,12 +64,12 @@ std::size_t State::count_todo() const
   return boost::range::count_if(this->actors_to_run_, [](auto& pair) { return pair.second.is_todo(); });
 }
 
-void State::mark_all_todo()
+void State::mark_all_enabled_todo()
 {
-  for (auto& [aid, actor] : actors_to_run_) {
-
-    if (actor.is_enabled() and not actor.is_done() and not actor.is_todo())
-      actor.mark_todo();
+  for (auto const& [aid, _] : this->get_actors_list()) {
+      if (this->is_actor_enabled(aid) and not is_actor_done(aid)) {
+      this->mark_todo(aid);
+    }
   }
 }
 
@@ -99,7 +102,7 @@ aid_t State::next_transition() const
   return -1;
 }
 
-void State::execute_next(aid_t next)
+void State::execute_next(aid_t next, RemoteApp& app)
 {
   // This actor is ready to be executed. Execution involves three phases:
 
@@ -115,7 +118,7 @@ void State::execute_next(aid_t next)
 
   // 2. Execute the actor according to the preparation above
   Transition::executed_transitions_++;
-  auto* just_executed = mc_model_checker->handle_simcall(next, times_considered, true);
+  auto* just_executed = app.handle_simcall(next, times_considered, true);
   xbt_assert(just_executed->type_ == expected_executed_transition->type_,
              "The transition that was just executed by actor %ld, viz:\n"
              "%s\n"
@@ -134,6 +137,6 @@ void State::execute_next(aid_t next)
   auto executed_transition = std::unique_ptr<Transition>(just_executed);
   actor_state.set_transition(std::move(executed_transition), times_considered);
 
-  mc_model_checker->wait_for_requests();
+  app.wait_for_requests();
 }
 } // namespace simgrid::mc