Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
mc: snake_case a class
[simgrid.git] / src / mc / checker / SafetyChecker.cpp
index faca5d2..6b1c4da 100644 (file)
@@ -17,6 +17,7 @@
 #include "src/mc/Transition.hpp"
 #include "src/mc/VisitedState.hpp"
 #include "src/mc/checker/SafetyChecker.hpp"
+#include "src/mc/mc_config.hpp"
 #include "src/mc/mc_exit.hpp"
 #include "src/mc/mc_private.hpp"
 #include "src/mc/mc_record.hpp"
@@ -49,7 +50,7 @@ void SafetyChecker::checkNonTermination(simgrid::mc::State* current_state)
       for (auto const& s : mc_model_checker->getChecker()->getTextualTrace())
         XBT_INFO("  %s", s.c_str());
       simgrid::mc::dumpRecordPath();
-      simgrid::mc::session->logState();
+      simgrid::mc::session->log_state();
 
       throw simgrid::mc::TerminationError();
     }
@@ -181,7 +182,7 @@ void SafetyChecker::run()
   }
 
   XBT_INFO("No property violation found.");
-  simgrid::mc::session->logState();
+  simgrid::mc::session->log_state();
 }
 
 void SafetyChecker::backtrack()
@@ -270,12 +271,12 @@ void SafetyChecker::restoreState()
   /* Intermediate backtracking */
   simgrid::mc::State* last_state = stack_.back().get();
   if (last_state->system_state) {
-    simgrid::mc::restore_snapshot(last_state->system_state);
+    last_state->system_state->restore(&mc_model_checker->process());
     return;
   }
 
   /* Restore the initial state */
-  simgrid::mc::session->restoreInitialState();
+  simgrid::mc::session->restore_initial_state();
 
   /* Traverse the stack from the state at position start and re-execute the transitions */
   for (std::unique_ptr<simgrid::mc::State> const& state : stack_) {