[mc] Move visitedState as a field of SafetyChecker

[simgrid.git] / src / mc / ModelChecker.hpp

diff --git a/src/mc/ModelChecker.hpp b/src/mc/ModelChecker.hpp
index 7f770c3..2c1abd2 100644 (file)
--- a/src/mc/ModelChecker.hpp
+++ b/src/mc/ModelChecker.hpp
@@ -30,13 +30,14 @@ namespace mc {
 class ModelChecker {
   struct pollfd fds_[2];
   /** String pool for host names */
-  // TODO, use std::unordered_set with heterogeneous comparison lookup (C++14)
-  xbt_dict_t /* <hostname, NULL> */ hostnames_;
+  // TODO, use std::set with heterogeneous comparison lookup (C++14)?
+  xbt_dict_t /* <hostname, nullptr> */ hostnames_;
   // This is the parent snapshot of the current state:
   PageStore page_store_;
   std::unique_ptr<Process> process_;
+  Checker* checker_ = nullptr;
 public:
-  mc_snapshot_t parent_snapshot_;
+  std::shared_ptr<simgrid::mc::Snapshot> parent_snapshot_;
 
 public:
   ModelChecker(ModelChecker const&) = delete;
@@ -54,11 +55,6 @@ public:
   }
   const char* get_host_name(const char* name);
 
-  bool is_important_snapshot(Snapshot const& snapshot) const
-  {
-    return &snapshot == this->parent_snapshot_;
-  }
-
   void start();
   void shutdown();
   void resume(simgrid::mc::Process& process);
@@ -70,6 +66,13 @@ public:
   {
     mc_model_checker->wait_client(mc_model_checker->process());
   }
+  void exit(int status);
+
+  bool checkDeadlock();
+
+  Checker* getChecker() const { return checker_; }
+  void setChecker(Checker* checker) { checker_ = checker; }
+
 private:
   void setup_ignore();
   bool handle_message(char* buffer, ssize_t size);