X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/11b3aba7be638c39ab0a5238883fc6bd688d86c5..3e8cbdbebfce89fb0abf0cb8710c8505e111d097:/src/mc/api/State.cpp?ds=sidebyside

diff --git a/src/mc/api/State.cpp b/src/mc/api/State.cpp
index 262e0108d6..dae2c6f936 100644
--- a/src/mc/api/State.cpp
+++ b/src/mc/api/State.cpp
@@ -1,10 +1,9 @@
-/* Copyright (c) 2008-2022. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2008-2023. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "src/mc/api/State.hpp"
-#include "src/mc/api.hpp"
 #include "src/mc/mc_config.hpp"
 
 #include <boost/range/algorithm.hpp>
@@ -15,31 +14,64 @@ namespace simgrid::mc {
 
 long State::expended_states_ = 0;
 
-State::State(Session& session) : num_(++expended_states_)
+State::State(const RemoteApp& remote_app) : num_(++expended_states_)
 {
-  auto actors = mc_model_checker->get_remote_process().actors();
+  remote_app.get_actors_status(actors_to_run_);
 
-  for (unsigned int i = 0; i < actors.size(); i++) {
-    auto remote_actor = actors[i].copy.get_buffer();
-    aid_t aid         = remote_actor->get_pid();
-
-    actor_states_.insert(
-        std::make_pair(aid, ActorState(aid, session.actor_is_enabled(aid), remote_actor->simcall_.mc_max_consider_)));
+  transition_.reset(new Transition());
+  /* 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_);
   }
+}
+
+State::State(const RemoteApp& remote_app, const State* previous_state) : num_(++expended_states_)
+{
+
+  remote_app.get_actors_status(actors_to_run_);
 
   transition_.reset(new Transition());
   /* Stateful model checking */
   if ((_sg_mc_checkpoint > 0 && (num_ % _sg_mc_checkpoint == 0)) || _sg_mc_termination) {
-    auto snapshot_ptr = Api::get().take_snapshot(num_);
-    system_state_     = std::shared_ptr<simgrid::mc::Snapshot>(snapshot_ptr);
+    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->actor_states_, [](auto& pair) { return pair.second.is_todo(); });
+  return boost::range::count_if(this->actors_to_run_, [](auto& pair) { return pair.second.is_todo(); });
 }
 
+    void State::mark_all_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();
+	
+    }
+}
+    
 Transition* State::get_transition() const
 {
   return transition_.get();
@@ -47,11 +79,25 @@ Transition* State::get_transition() const
 
 aid_t State::next_transition() const
 {
-  XBT_DEBUG("Search for an actor to run. %zu actors to consider", actor_states_.size());
-  for (auto const& [aid, actor] : actor_states_) {
+  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())
-      continue;
+      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;
   }
@@ -60,7 +106,7 @@ aid_t State::next_transition() const
 void State::execute_next(aid_t next)
 {
   /* This actor is ready to be executed. Prepare its execution when simcall_handle will be called on it */
-  const unsigned times_considered = actor_states_.at(next).do_consider();
+  const unsigned times_considered = actors_to_run_.at(next).do_consider();
 
   XBT_DEBUG("Let's run actor %ld (times_considered = %u)", next, times_considered);