X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/75e982c8df081076c4d1c40e94552c4159b46feb..ae62510f83c4cd6e7967aa00897bf66671a5923a:/src/mc/explo/DFSExplorer.cpp

diff --git a/src/mc/explo/DFSExplorer.cpp b/src/mc/explo/DFSExplorer.cpp
index f1fa21bfeb..e8bb0b0979 100644
--- a/src/mc/explo/DFSExplorer.cpp
+++ b/src/mc/explo/DFSExplorer.cpp
@@ -136,7 +136,6 @@ void DFSExplorer::run()
         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());
-	stack_.pop_back();
 
       }
       
@@ -144,6 +143,13 @@ void DFSExplorer::run()
       continue;
     }
 
+    XBT_VERB("Sleep set actually containing:");
+    for (auto & [aid, transition] : state->get_sleep_set()) {
+      
+	XBT_VERB("  <%ld,%s>", aid, transition.to_string().c_str());
+      
+    }
+
     /* Actually answer the request: let's execute the selected request (MCed does one step) */
     state->execute_next(next);
     on_transition_execute_signal(state->get_transition(), get_remote_app());
@@ -154,9 +160,18 @@ void DFSExplorer::run()
              state->get_transition()->to_string().c_str(), stack_.size(), state->get_num(), state->count_todo());
 
     /* Create the new expanded state (copy the state of MCed into our MCer data) */
-    auto next_state = std::make_unique<State>(get_remote_app());
+    std::__detail::__unique_ptr_t<simgrid::mc::State> next_state;
+
+    /* If we want sleep set reduction, pass the old state to the new state so it can
+     * both copy the sleep set and eventually removes things from it locally */
+    if (sleep_set_reduction_)
+	next_state = std::make_unique<State>(get_remote_app(), state); 
+    else
+	next_state = std::make_unique<State>(get_remote_app());
+
     on_state_creation_signal(next_state.get(), get_remote_app());
 
+		
     if (_sg_mc_termination)
       this->check_non_termination(next_state.get());
 
@@ -168,7 +183,7 @@ void DFSExplorer::run()
     if (visited_state_ == nullptr) {
       /* Get an enabled process and insert it in the interleave set of the next state */
       for (auto const& [aid, _] : next_state->get_actors_list()) {
-        if (next_state->is_actor_enabled(aid)) {
+        if (next_state->is_actor_enabled(aid) and not next_state->is_done(aid)) {
           next_state->mark_todo(aid);
           if (reduction_mode_ == ReductionMode::dpor)
             break; // With DPOR, we take the first enabled transition
@@ -197,15 +212,26 @@ void DFSExplorer::backtrack()
 
   get_remote_app().check_deadlock();
 
+  /* We may backtrack from somewhere either because it's leaf, or because every enabled process are in done/sleep set.
+   * In the first case, we need to remove the last transition corresponding to the Finalize */
+  if (stack_.back()->get_transition()->aid_ == 0)
+      stack_.pop_back();
+  
   /* 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
-   *  predecessor state), depends on any other previous request executed before it. If it does then add it to the
-   *  interleave set of the state that executed that previous request. */
+   *  predecessor state) depends on any other previous request executed before it on another process. If there exists one,
+   *  find the more recent, and add its process to the interleave set. If the process is not enabled at this point,
+   *  then add every enabled process to the interleave */
   bool found_backtracking_point = false;
   while (not stack_.empty() && not found_backtracking_point) {
     std::unique_ptr<State> state = std::move(stack_.back());
+    
     stack_.pop_back();
-    state->set_done(state->get_transition()->aid_);
+    
+    XBT_DEBUG("Marking Transition >>%s<< of process %ld done and adding it to the sleep set", state->get_transition()->to_string().c_str(), state->get_transition()->aid_);
+    state->mark_done(state->get_transition()->aid_);
+    state->add_sleep_set(state->get_transition());
+
     if (reduction_mode_ == ReductionMode::dpor) {
       aid_t issuer_id = state->get_transition()->aid_;
       for (auto i = stack_.rbegin(); i != stack_.rend(); ++i) {
@@ -225,7 +251,7 @@ void DFSExplorer::backtrack()
 	      else
 		  XBT_DEBUG("Actor %ld is already in done set: no need to explore it again", issuer_id);
 	  } else {
-	      XBT_DEBUG("Actor %ld is not enabled: DPOR may be failing, to stay sound, we are marking every enabled transition todo", issuer_id);
+	      XBT_DEBUG("Actor %ld is not enabled: DPOR may be failing. To stay sound, we are marking every enabled transition as todo", issuer_id);
 	      prev_state->mark_all_todo();
 	  }
           break;
@@ -237,12 +263,12 @@ void DFSExplorer::backtrack()
       }
     }
 
-    if (state->count_todo() == 0) { // Empty interleaving set
+    if (state->count_todo() == 0) { // Empty interleaving set: exploration at this level is over
       XBT_DEBUG("Delete state %ld at depth %zu", state->get_num(), stack_.size() + 1);
 
     } else {
 	XBT_DEBUG("Back-tracking to state %ld at depth %zu: %ld transitions left to be explored", state->get_num(), stack_.size() + 1, state->count_todo());
-      stack_.push_back(std::move(state)); // Put it back on the stack
+      stack_.push_back(std::move(state)); // Put it back on the stack so we can explore the next transition of the interleave
       found_backtracking_point = true;
     }
   }
@@ -279,6 +305,8 @@ DFSExplorer::DFSExplorer(const std::vector<char*>& args, bool with_dpor) : Explo
   else
     reduction_mode_ = ReductionMode::none;
 
+  sleep_set_reduction_ = _sg_mc_sleep_set;
+  
   if (_sg_mc_termination) {
     if (with_dpor) {
       XBT_INFO("Check non progressive cycles (turning DPOR off)");