Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
One use less of get_recipe() that will soon die
authorMartin Quinson <martin.quinson@ens-rennes.fr>
Fri, 28 Apr 2023 00:01:20 +0000 (02:01 +0200)
committerMartin Quinson <martin.quinson@ens-rennes.fr>
Wed, 3 May 2023 13:50:31 +0000 (15:50 +0200)
src/mc/explo/DFSExplorer.cpp
src/mc/mc_record.hpp

index 63765f8..4742ab4 100644 (file)
@@ -69,10 +69,13 @@ void DFSExplorer::check_non_termination(const State* current_state)
 RecordTrace DFSExplorer::get_record_trace() // override
 {
   RecordTrace res;
-  for (auto const& transition : stack_.back()->get_recipe())
-    res.push_back(transition);
+
   if (const auto trans = stack_.back()->get_transition_out(); trans != nullptr)
-    res.push_back(stack_.back()->get_transition_out().get());
+    res.push_back(trans.get());
+  for (const auto* state = stack_.back().get(); state != nullptr; state = state->get_parent_state().get())
+    if (state->get_transition_in() != nullptr)
+      res.push_front(state->get_transition_in().get());
+
   return res;
 }
 
index 753ffaf..b0739db 100644 (file)
 #include "src/mc/mc_forward.hpp"
 #include "xbt/base.h"
 
+#include <deque>
 #include <string>
-#include <vector>
 
 namespace simgrid::mc {
 
 class RecordTrace {
-  std::vector<Transition*> transitions_;
+  std::deque<Transition*> transitions_;
 
 public:
   RecordTrace() = default;
@@ -35,9 +35,10 @@ public:
   /** Make a string representation that can later be used to create a new trace */
   std::string to_string() const;
 
+  void push_front(Transition* t) { transitions_.push_front(t); }
   void push_back(Transition* t) { transitions_.push_back(t); }
-  std::vector<Transition*>::const_iterator begin() const { return transitions_.begin(); }
-  std::vector<Transition*>::const_iterator end() const { return transitions_.end(); }
+  std::deque<Transition*>::const_iterator begin() const { return transitions_.begin(); }
+  std::deque<Transition*>::const_iterator end() const { return transitions_.end(); }
 
   /** Replay all transitions of a trace */
   void replay() const;