Convert Api::get_maxpid() into RemoteApp::get_maxpid()

[simgrid.git] / src / mc / explo / DFSExplorer.cpp

diff --git a/src/mc/explo/DFSExplorer.cpp b/src/mc/explo/DFSExplorer.cpp
index 64b095e..9a61e12 100644 (file)
--- a/src/mc/explo/DFSExplorer.cpp
+++ b/src/mc/explo/DFSExplorer.cpp
@@ -126,10 +126,10 @@ void DFSExplorer::run()
     int next = state->next_transition();
 
     if (next < 0) { // If there is no more transition in the current state, backtrack.
-      XBT_DEBUG("There remains %zu actors, but none to interleave (depth %zu).",
-                mc_model_checker->get_remote_process().actors().size(), stack_.size() + 1);
+      XBT_DEBUG("There remains %d actors, but none to interleave (depth %zu).", state->get_actor_count(),
+                stack_.size() + 1);
 
-      if (mc_model_checker->get_remote_process().actors().empty()) {
+      if (state->get_actor_count() == 0) {
         mc_model_checker->finalize_app();
         XBT_VERB("Execution came to an end at %s (state: %ld, depth: %zu)", get_record_trace().to_string().c_str(),
                  state->get_num(), stack_.size());
@@ -147,12 +147,8 @@ void DFSExplorer::run()
     XBT_VERB("Execute %ld: %.60s (stack depth: %zu, state: %ld, %zu interleaves)", state->get_transition()->aid_,
              state->get_transition()->to_string().c_str(), stack_.size(), state->get_num(), state->count_todo());
 
-    std::string req_str;
-    if (dot_output != nullptr)
-      req_str = state->get_transition()->dot_string();
-
     /* Create the new expanded state (copy the state of MCed into our MCer data) */
-    auto next_state = std::make_unique<State>(get_session());
+    auto next_state = std::make_unique<State>(get_remote_app());
     on_state_creation_signal(next_state.get());
 
     if (_sg_mc_termination)
@@ -175,12 +171,12 @@ void DFSExplorer::run()
 
       if (dot_output != nullptr)
         std::fprintf(dot_output, "\"%ld\" -> \"%ld\" [%s];\n", state->get_num(), next_state->get_num(),
-                     req_str.c_str());
+                     state->get_transition()->dot_string().c_str());
 
     } else if (dot_output != nullptr)
       std::fprintf(dot_output, "\"%ld\" -> \"%ld\" [%s];\n", state->get_num(),
                    visited_state_->original_num == -1 ? visited_state_->num : visited_state_->original_num,
-                   req_str.c_str());
+                   state->get_transition()->dot_string().c_str());
 
     stack_.push_back(std::move(next_state));
   }
@@ -195,7 +191,7 @@ void DFSExplorer::backtrack()
   on_backtracking_signal();
   stack_.pop_back();
 
-  get_session().check_deadlock();
+  get_remote_app().check_deadlock();
 
   /* Traverse the stack backwards until a state with a non empty interleave set is found, deleting all the states that
    *  have it empty in the way. For each deleted state, check if the request that has generated it (from its
@@ -256,7 +252,7 @@ void DFSExplorer::restore_state()
   }
 
   /* if no snapshot, we need to restore the initial state and replay the transitions */
-  get_session().restore_initial_state();
+  get_remote_app().restore_initial_state();
   on_restore_initial_state_signal();
 
   /* Traverse the stack from the state at position start and re-execute the transitions */
@@ -270,7 +266,7 @@ void DFSExplorer::restore_state()
   }
 }
 
-DFSExplorer::DFSExplorer(Session* session) : Exploration(session)
+DFSExplorer::DFSExplorer(RemoteApp& remote_app) : Exploration(remote_app)
 {
   reductionMode_ = reduction_mode;
   if (_sg_mc_termination)
@@ -285,11 +281,9 @@ DFSExplorer::DFSExplorer(Session* session) : Exploration(session)
              (reductionMode_ == ReductionMode::none ? "none"
                                                     : (reductionMode_ == ReductionMode::dpor ? "dpor" : "unknown")));
 
-  get_session().take_initial_snapshot();
-
   XBT_DEBUG("Starting the DFS exploration");
 
-  auto initial_state = std::make_unique<State>(get_session());
+  auto initial_state = std::make_unique<State>(get_remote_app());
 
   XBT_DEBUG("**************************************************");
 
@@ -309,9 +303,9 @@ DFSExplorer::DFSExplorer(Session* session) : Exploration(session)
   stack_.push_back(std::move(initial_state));
 }
 
-Exploration* create_dfs_exploration(Session* session)
+Exploration* create_dfs_exploration(RemoteApp& remote_app)
 {
-  return new DFSExplorer(session);
+  return new DFSExplorer(remote_app);
 }
 
 } // namespace simgrid::mc