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

diff --git a/src/mc/explo/DFSExplorer.cpp b/src/mc/explo/DFSExplorer.cpp
index 8d85325ef7..0466d6654f 100644
--- a/src/mc/explo/DFSExplorer.cpp
+++ b/src/mc/explo/DFSExplorer.cpp
@@ -138,19 +138,17 @@ void DFSExplorer::run()
     const aid_t next = reduction_mode_ == ReductionMode::odpor ? state->next_odpor_transition()
                                                                : std::get<0>(state->next_transition_guided());
 
-
     if (next < 0 || not state->is_actor_enabled(next)) {
       if (next >= 0) { // Actor is not enabled, then
-        XBT_INFO("Reduction %s wants to execute a disabled transition %s. If it's ODPOR, ReversibleRace is suboptimal.",
-                 to_c_str(reduction_mode_),
-                 state->get_actors_list().at(next).get_transition()->to_string(true).c_str());
+        XBT_DEBUG(
+            "Reduction %s wants to execute a disabled transition %s. If it's ODPOR, ReversibleRace is suboptimal.",
+            to_c_str(reduction_mode_), state->get_actors_list().at(next).get_transition()->to_string(true).c_str());
         if (reduction_mode_ == ReductionMode::odpor) {
-          XBT_INFO("Current trace:");
-          for (auto elm : get_textual_trace())
-            XBT_ERROR("%s", elm.c_str());
-	  // Remove the disabled transition from the wakeup tree so that ODPOR doesn't try it again
-	  state->remove_subtree_at_aid(next);
-	  state->add_sleep_set(state->get_actors_list().at(next).get_transition());
+          // Remove the disabled transition from the wakeup tree so that ODPOR doesn't try it again
+          state->remove_subtree_at_aid(next);
+          state->add_sleep_set(state->get_actors_list().at(next).get_transition());
+        } else {
+          xbt_assert(false, "Only ODPOR should be confident enought in itself to try executing a disabled transition");
         }
       }
       // If there is no more transition in the current state (or if ODPOR picked an actor that is not enabled --
@@ -352,6 +350,9 @@ std::shared_ptr<State> DFSExplorer::next_odpor_state()
     XBT_DEBUG("\tPerformed ODPOR 'clean-up'. Sleep set has:");
     for (const auto& [aid, transition] : state->get_sleep_set())
       XBT_DEBUG("\t  <%ld,%s>", aid, transition->to_string().c_str());
+    if (not state->has_empty_tree()) {
+      return state;
+    }
   }
   return nullptr;
 }