From 3bf8dd63803f44adc6ef0fd84474b515b5df960c Mon Sep 17 00:00:00 2001
From: Ehsan Azimi <eazimi@ehsan.irisa.fr>
Date: Mon, 30 Nov 2020 10:02:41 +0100
Subject: [PATCH] mcapi::s_restore_initial_state() renamed to
 mcapi::restore_initial_state()

---
 src/mc/checker/CommunicationDeterminismChecker.cpp | 2 +-
 src/mc/checker/SafetyChecker.cpp                   | 2 +-
 src/mc/mc_api.cpp                                  | 2 +-
 src/mc/mc_api.hpp                                  | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/mc/checker/CommunicationDeterminismChecker.cpp b/src/mc/checker/CommunicationDeterminismChecker.cpp
index 34e669b64d..f4795c7a77 100644
--- a/src/mc/checker/CommunicationDeterminismChecker.cpp
+++ b/src/mc/checker/CommunicationDeterminismChecker.cpp
@@ -344,7 +344,7 @@ void CommunicationDeterminismChecker::restoreState()
   }
 
   /* Restore the initial state */
-  mcapi::get().s_restore_initial_state();
+  mcapi::get().restore_initial_state();
 
   unsigned n = mcapi::get().get_maxpid();
   assert(n == incomplete_communications_pattern.size());
diff --git a/src/mc/checker/SafetyChecker.cpp b/src/mc/checker/SafetyChecker.cpp
index cf9261449a..19a3d16c72 100644
--- a/src/mc/checker/SafetyChecker.cpp
+++ b/src/mc/checker/SafetyChecker.cpp
@@ -256,7 +256,7 @@ void SafetyChecker::restore_state()
   }
 
   /* Restore the initial state */
-  mcapi::get().s_restore_initial_state();
+  mcapi::get().restore_initial_state();
 
   /* Traverse the stack from the state at position start and re-execute the transitions */
   for (std::unique_ptr<State> const& state : stack_) {
diff --git a/src/mc/mc_api.cpp b/src/mc/mc_api.cpp
index bee98a6fd2..3d37b20d42 100644
--- a/src/mc/mc_api.cpp
+++ b/src/mc/mc_api.cpp
@@ -482,7 +482,7 @@ void mc_api::s_close() const
   session->close();
 }
 
-void mc_api::s_restore_initial_state() const
+void mc_api::restore_initial_state() const
 {
   session->restore_initial_state();
 }
diff --git a/src/mc/mc_api.hpp b/src/mc/mc_api.hpp
index f7f5e13dc0..f4aeb89d06 100644
--- a/src/mc/mc_api.hpp
+++ b/src/mc/mc_api.hpp
@@ -91,16 +91,16 @@ public:
 
   // STATE APIs
   void restore_state(std::shared_ptr<simgrid::mc::Snapshot> system_state) const;
+  void log_state() const;
+  void restore_initial_state() const;
 
   // SNAPSHOT APIs
   bool snapshot_equal(const Snapshot* s1, const Snapshot* s2) const;
   simgrid::mc::Snapshot* take_snapshot(int num_state) const;
-  void log_state() const;
 
   // SESSION APIs
   void s_initialize() const;
   void s_close() const;
-  void s_restore_initial_state() const;
   void execute(Transition const& transition);
 };
 
-- 
2.20.1