X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7b50ef668fe46e44363e4c7ea2089e37c6afec38..824740eb0df1dedddb86035ff3730d87e037f356:/src/mc/api/State.cpp

diff --git a/src/mc/api/State.cpp b/src/mc/api/State.cpp
index e93885701f..69fae98b37 100644
--- a/src/mc/api/State.cpp
+++ b/src/mc/api/State.cpp
@@ -4,6 +4,9 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "src/mc/api/State.hpp"
+#include "src/mc/api/strategy/BasicStrategy.hpp"
+#include "src/mc/api/strategy/WaitStrategy.hpp"
+#include "src/mc/explo/Exploration.hpp"
 #include "src/mc/mc_config.hpp"
 
 #include <boost/range/algorithm.hpp>
@@ -14,28 +17,80 @@ 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_);
+  XBT_VERB("Creating a guide for the state");
+  if (_sg_mc_strategy == "none")
+    strategy_ = std::make_shared<BasicStrategy>();
+  if (_sg_mc_strategy == "nb_wait")
+    strategy_ = std::make_shared<WaitStrategy>();
 
+  recipe_ = std::list<Transition*>();
+
+  remote_app.get_actors_status(strategy_->actors_to_run_);
+
+#if SIMGRID_HAVE_STATEFUL_MC
   /* 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());
+#endif
+}
+
+State::State(RemoteApp& remote_app, std::shared_ptr<State> parent_state)
+    : num_(++expended_states_), parent_state_(parent_state)
+{
+
+  if (_sg_mc_strategy == "none")
+    strategy_ = std::make_shared<BasicStrategy>();
+  if (_sg_mc_strategy == "nb_wait")
+    strategy_ = std::make_shared<WaitStrategy>();
+  *strategy_ = *(parent_state->strategy_);
+
+  recipe_ = std::list(parent_state_->get_recipe());
+  recipe_.push_back(parent_state_->get_transition());
+
+  remote_app.get_actors_status(strategy_->actors_to_run_);
+
+#if SIMGRID_HAVE_STATEFUL_MC /* 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_, remote_app.get_page_store(),
+                                                            *remote_app.get_remote_process_memory());
+#endif
+
+  /* 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_.try_emplace(aid, transition);
+        if (strategy_->actors_to_run_.count(aid) != 0) {
+          XBT_DEBUG("Actor %ld will not be explored, for it is in the sleep set", aid);
+
+          strategy_->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());
+    }
   }
 }
 
 std::size_t State::count_todo() const
 {
-  return boost::range::count_if(this->actors_to_run_, [](auto& pair) { return pair.second.is_todo(); });
+  return boost::range::count_if(this->strategy_->actors_to_run_, [](auto& pair) { return pair.second.is_todo(); });
 }
 
-void State::mark_all_enabled_todo()
+std::size_t State::count_todo_multiples() const
 {
-  for (auto const& [aid, _] : this->get_actors_list()) {
-    if (this->is_actor_enabled(aid)) {
-      this->mark_todo(aid);
-    }
-  }
+  size_t count = 0;
+  for (auto& [_, actor] : strategy_->actors_to_run_)
+    if (actor.is_todo())
+      count += actor.get_times_not_considered();
+
+  return count;
 }
 
 Transition* State::get_transition() const
@@ -45,24 +100,43 @@ Transition* State::get_transition() const
 
 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_) {
+  XBT_DEBUG("Search for an actor to run. %zu actors to consider", strategy_->actors_to_run_.size());
+  for (auto const& [aid, actor] : strategy_->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;
   }
   return -1;
 }
 
-void State::execute_next(aid_t next)
+std::pair<aid_t, double> State::next_transition_guided() const
 {
+  return strategy_->next_transition();
+}
+
+// This should be done in GuidedState, or at least interact with it
+void State::execute_next(aid_t next, RemoteApp& app)
+{
+  // First, warn the guide, so it knows how to build a proper child state
+  strategy_->execute_next(next, app);
+
   // This actor is ready to be executed. Execution involves three phases:
 
   // 1. Identify the appropriate ActorState to prepare for execution
   // when simcall_handle will be called on it
-  auto& actor_state                        = actors_to_run_.at(next);
+  auto& actor_state                        = strategy_->actors_to_run_.at(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,
@@ -72,7 +146,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"
@@ -91,6 +165,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