Change opened states for a priority queue

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

diff --git a/src/mc/api/State.cpp b/src/mc/api/State.cpp
index a839b28f04d307c74146da0c4d98d971561cd4b7..e2a6ac4534b5aa7777c8c7099e068643fafe2f42 100644 (file)
--- a/src/mc/api/State.cpp
+++ b/src/mc/api/State.cpp
@@ -5,7 +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/api/guide/WaitGuide.hpp"
 #include "src/mc/explo/Exploration.hpp"
 #include "src/mc/mc_config.hpp"
 
@@ -17,33 +17,47 @@ namespace simgrid::mc {
 
 long State::expended_states_ = 0;
 
+State::State(const State& other)
+    : transition_(other.transition_)
+    , num_(other.num_)
+    , system_state_(other.system_state_)
+    , parent_state_(nullptr)
+    , guide_(other.guide_)
+    , sleep_set_(other.sleep_set_)
+{
+}
+
 State::State(RemoteApp& remote_app) : num_(++expended_states_)
 {
-  remote_app.get_actors_status(guide_->actors_to_run_);
-  if (_sg_mc_guided == "none")  
-      guide_ = std::make_unique<BasicGuide>();
+  XBT_VERB("Creating a guide for the state");
+  if (_sg_mc_guided == "none")
+    guide_ = std::make_shared<BasicGuide>();
   if (_sg_mc_guided == "nb_wait")
-      guide_ = std::make_unique<BasicGuide>();  
+    guide_ = std::make_shared<WaitGuide>();
+
+  remote_app.get_actors_status(guide_->actors_to_run_);
+
   /* 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());
+                                                            *remote_app.get_remote_process_memory());
 }
 
-State::State(RemoteApp& remote_app, const State* parent_state)
-    : num_(++expended_states_), parent_state_(parent_state)
+State::State(RemoteApp& remote_app, const State* parent_state) : num_(++expended_states_), parent_state_(parent_state)
 {
-    
-    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>();        
-    
+
+  if (_sg_mc_guided == "none")
+    guide_ = std::make_shared<BasicGuide>();
+  if (_sg_mc_guided == "nb_wait")
+    guide_ = std::make_shared<WaitGuide>();
+  *guide_ = *(parent_state->guide_);
+
+  remote_app.get_actors_status(guide_->actors_to_run_);
+
   /* 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());
+                                                            *remote_app.get_remote_process_memory());
 
   /* If we want sleep set reduction, copy the sleep set and eventually removes things from it */
   if (_sg_mc_sleep_set) {
@@ -51,10 +65,8 @@ State::State(RemoteApp& remote_app, const State* parent_state)
      * 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_.emplace(aid, transition);
+        sleep_set_.try_emplace(aid, transition);
         if (guide_->actors_to_run_.count(aid) != 0) {
           XBT_DEBUG("Actor %ld will not be explored, for it is in the sleep set", aid);
 
@@ -72,6 +84,16 @@ std::size_t State::count_todo() const
   return boost::range::count_if(this->guide_->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] : guide_->actors_to_run_)
+    if (actor.is_todo())
+      count += actor.get_times_not_considered();
+
+  return count;
+}
+
 Transition* State::get_transition() const
 {
   return transition_;
@@ -83,7 +105,6 @@ aid_t State::next_transition() const
   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()) {
-
       if (not actor.is_todo())
         XBT_DEBUG("Can't run actor %ld because it is not todo", aid);
 
@@ -109,6 +130,9 @@ std::pair<aid_t, double> State::next_transition_guided() const
 // 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
+  guide_->execute_next(next, app);
+
   // This actor is ready to be executed. Execution involves three phases:
 
   // 1. Identify the appropriate ActorState to prepare for execution