X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/df016dbb4c27e8824d3f108cec36e76cf35eeb06..9692d43fa911bdc2d6d0263a3cb3e22d5e3167fe:/src/mc/SafetyChecker.hpp

diff --git a/src/mc/SafetyChecker.hpp b/src/mc/SafetyChecker.hpp
index 0bc502d20b..b2dd2696ae 100644
--- a/src/mc/SafetyChecker.hpp
+++ b/src/mc/SafetyChecker.hpp
@@ -8,14 +8,18 @@
 #define SIMGRID_MC_SAFETY_CHECKER_HPP
 
 #include <list>
+#include <memory>
+#include <string>
+#include <vector>
 
 #include "src/mc/mc_forward.hpp"
 #include "src/mc/Checker.hpp"
+#include "src/mc/VisitedState.hpp"
 
 namespace simgrid {
 namespace mc {
 
-class SafetyChecker : public Checker {
+class XBT_PRIVATE SafetyChecker : public Checker {
   simgrid::mc::ReductionMode reductionMode_ = simgrid::mc::ReductionMode::unset;
 public:
   SafetyChecker(Session& session);
@@ -23,13 +27,19 @@ public:
   int run() override;
   RecordTrace getRecordTrace() override;
   std::vector<std::string> getTextualTrace() override;
+  void logState() override;
 private:
   // Temp
   void init();
-  bool checkNonDeterminism(simgrid::mc::State* current_state);
+  bool checkNonTermination(simgrid::mc::State* current_state);
+  int backtrack();
+  void restoreState();
 private:
   /** Stack representing the position in the exploration graph */
-  std::list<simgrid::mc::State*> stack_;
+  std::list<std::unique_ptr<simgrid::mc::State>> stack_;
+  simgrid::mc::VisitedStates visitedStates_;
+  std::unique_ptr<simgrid::mc::VisitedState> visitedState_;
+  unsigned long expandedStatesCount_ = 0;
 };
 
 }