Merge branch 'master' of https://framagit.org/simgrid/simgrid

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

diff --git a/src/mc/api/State.cpp b/src/mc/api/State.cpp
index f91a369..14f0208 100644 (file)
--- a/src/mc/api/State.cpp
+++ b/src/mc/api/State.cpp
@@ -24,11 +24,52 @@ State::State(const RemoteApp& remote_app) : num_(++expended_states_)
   }
 }
 
+State::State(const RemoteApp& remote_app, const State* previous_state)
+    : default_transition_(std::make_unique<Transition>()), num_(++expended_states_)
+{
+
+  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();
+      }
+    } 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());
+  }
+}
+
 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_enabled_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);
+    }
+  }
+}
+
 Transition* State::get_transition() const
 {
   return transition_;
@@ -39,8 +80,19 @@ aid_t State::next_transition() const
   XBT_DEBUG("Search for an actor to run. %zu actors to consider", actors_to_run_.size());
   for (auto const& [aid, actor] : actors_to_run_) {
     /* Only consider actors (1) marked as interleaving by the checker and (2) currently enabled in the application */
-    if (not actor.is_todo() || not actor.is_enabled())
+    if (not actor.is_todo() || not actor.is_enabled() || actor.is_done()) {
+
+      if (not actor.is_todo())
+        XBT_DEBUG("Can't run actor %ld because it is not todo", aid);
+
+      if (not actor.is_enabled())
+        XBT_DEBUG("Can't run actor %ld because it is not enabled", aid);
+
+      if (actor.is_done())
+        XBT_DEBUG("Can't run actor %ld because it has already been done", aid);
+
       continue;
+    }
 
     return aid;
   }
@@ -57,7 +109,7 @@ void State::execute_next(aid_t next)
   const unsigned times_considered          = actor_state.do_consider();
   const auto* expected_executed_transition = actor_state.get_transition(times_considered);
   xbt_assert(expected_executed_transition != nullptr,
-             "Expected a transition with %d times considered to be noted in actor %lu", times_considered, next);
+             "Expected a transition with %u times considered to be noted in actor %ld", times_considered, next);
 
   XBT_DEBUG("Let's run actor %ld (times_considered = %u)", next, times_considered);
 
@@ -65,7 +117,7 @@ void State::execute_next(aid_t next)
   Transition::executed_transitions_++;
   auto* just_executed = mc_model_checker->handle_simcall(next, times_considered, true);
   xbt_assert(just_executed->type_ == expected_executed_transition->type_,
-             "The transition that was just executed by actor %lu, viz:\n"
+             "The transition that was just executed by actor %ld, viz:\n"
              "%s\n"
              "is not what was purportedly scheduled to execute, which was:\n"
              "%s\n",