X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5fdd462d52cd688ec709470cb45fd0ab5057203d..47130afb26809fc8c0e3a77cd168874a23abb62d:/src/mc/api/State.cpp

diff --git a/src/mc/api/State.cpp b/src/mc/api/State.cpp
index ce8daed7d7..58f7d28d8c 100644
--- a/src/mc/api/State.cpp
+++ b/src/mc/api/State.cpp
@@ -4,7 +4,8 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "src/mc/api/State.hpp"
-#include "src/mc/api/guide/BasicGuide.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"
 
@@ -16,25 +17,45 @@ namespace simgrid::mc {
 
 long State::expended_states_ = 0;
 
-State::State(RemoteApp& remote_app) : num_(++expended_states_), guide(std::make_unique<BasicGuide>())
+State::State(RemoteApp& remote_app) : num_(++expended_states_)
 {
-  remote_app.get_actors_status(guide->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_, remote_app.get_page_store(),
                                                             *remote_app.get_remote_process_memory());
+#endif
 }
 
-State::State(RemoteApp& remote_app, const State* parent_state)
-    : num_(++expended_states_), parent_state_(parent_state), guide(std::make_unique<BasicGuide>())
+State::State(RemoteApp& remote_app, std::shared_ptr<State> parent_state)
+    : num_(++expended_states_), parent_state_(parent_state)
 {
-  remote_app.get_actors_status(guide->actors_to_run_);
+  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_);
 
-  /* Stateful model checking */
+  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) {
@@ -44,10 +65,10 @@ State::State(RemoteApp& remote_app, const State* parent_state)
     for (auto& [aid, transition] : parent_state_->get_sleep_set()) {
       if (not parent_state_->get_transition()->depends(&transition)) {
         sleep_set_.try_emplace(aid, transition);
-        if (guide->actors_to_run_.count(aid) != 0) {
+        if (strategy_->actors_to_run_.count(aid) != 0) {
           XBT_DEBUG("Actor %ld will not be explored, for it is in the sleep set", aid);
 
-          guide->actors_to_run_.at(aid).mark_done();
+          strategy_->actors_to_run_.at(aid).mark_done();
         }
       } else
         XBT_DEBUG("Transition >>%s<< removed from the sleep set because it was dependent with >>%s<<",
@@ -58,7 +79,17 @@ State::State(RemoteApp& remote_app, const State* parent_state)
 
 std::size_t State::count_todo() const
 {
-  return boost::range::count_if(this->guide->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(); });
+}
+
+std::size_t State::count_todo_multiples() const
+{
+  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
@@ -68,8 +99,8 @@ Transition* State::get_transition() const
 
 aid_t State::next_transition() const
 {
-  XBT_DEBUG("Search for an actor to run. %zu actors to consider", guide->actors_to_run_.size());
-  for (auto const& [aid, actor] : guide->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() || actor.is_done()) {
       if (not actor.is_todo())
@@ -89,19 +120,22 @@ aid_t State::next_transition() const
   return -1;
 }
 
-std::pair<aid_t, double> State::next_transition_guided() const
+std::pair<aid_t, int> State::next_transition_guided() const
 {
-  return guide->next_transition();
+  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                        = guide->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,