X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/39a55a31e73d079c92a37793c58453f219c341aa..e2acbc187e721656cb1cd62ca067d1ebf59d0066:/src/mc/api/State.cpp

diff --git a/src/mc/api/State.cpp b/src/mc/api/State.cpp
index 008a8443a4..a839b28f04 100644
--- a/src/mc/api/State.cpp
+++ b/src/mc/api/State.cpp
@@ -5,6 +5,7 @@
 
 #include "src/mc/api/State.hpp"
 #include "src/mc/api/guide/BasicGuide.hpp"
+//#include "src/mc/api/guide/WaitGuide.hpp"
 #include "src/mc/explo/Exploration.hpp"
 #include "src/mc/mc_config.hpp"
 
@@ -16,10 +17,13 @@ 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_);
-
+  remote_app.get_actors_status(guide_->actors_to_run_);
+  if (_sg_mc_guided == "none")  
+      guide_ = std::make_unique<BasicGuide>();
+  if (_sg_mc_guided == "nb_wait")
+      guide_ = std::make_unique<BasicGuide>();  
   /* 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(),
@@ -27,11 +31,15 @@ State::State(RemoteApp& remote_app) : num_(++expended_states_), guide(std::make_
 }
 
 State::State(RemoteApp& remote_app, const State* parent_state)
-    : num_(++expended_states_), parent_state_(parent_state), guide(std::make_unique<BasicGuide>())
+    : num_(++expended_states_), parent_state_(parent_state)
 {
-
-  remote_app.get_actors_status(guide->actors_to_run_);
-
+    
+    remote_app.get_actors_status(guide_->actors_to_run_);
+    if (_sg_mc_guided == "none")  
+	guide_ = std::make_unique<BasicGuide>();
+    if (_sg_mc_guided == "nb_wait")
+	guide_ = std::make_unique<BasicGuide>();	
+    
   /* 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(),
@@ -47,10 +55,10 @@ State::State(RemoteApp& remote_app, const State* parent_state)
       if (not parent_state_->get_transition()->depends(&transition)) {
 
         sleep_set_.emplace(aid, transition);
-        if (guide->actors_to_run_.count(aid) != 0) {
+        if (guide_->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();
+          guide_->actors_to_run_.at(aid).mark_done();
         }
       } else
         XBT_DEBUG("Transition >>%s<< removed from the sleep set because it was dependent with >>%s<<",
@@ -61,16 +69,7 @@ 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(); });
-}
-
-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);
-    }
-  }
+  return boost::range::count_if(this->guide_->actors_to_run_, [](auto& pair) { return pair.second.is_todo(); });
 }
 
 Transition* State::get_transition() const
@@ -80,8 +79,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", guide_->actors_to_run_.size());
+  for (auto const& [aid, actor] : guide_->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()) {
 
@@ -104,7 +103,7 @@ aid_t State::next_transition() const
 
 std::pair<aid_t, double> State::next_transition_guided() const
 {
-  return guide->next_transition();
+  return guide_->next_transition();
 }
 
 // This should be done in GuidedState, or at least interact with it
@@ -114,7 +113,7 @@ void State::execute_next(aid_t next, RemoteApp& app)
 
   // 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                        = guide_->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,