[mc] Remove split the MCed and MCer part of MC_deadlock_check()

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

diff --git a/src/mc/ModelChecker.hpp b/src/mc/ModelChecker.hpp
index ee1a955..9bde129 100644 (file)
--- a/src/mc/ModelChecker.hpp
+++ b/src/mc/ModelChecker.hpp
@@ -17,10 +17,10 @@
 #include <xbt/base.h>
 #include <sys/types.h>
 
-#include "mc_forward.hpp"
+#include "src/mc/mc_forward.hpp"
 #include "src/mc/Process.hpp"
 #include "src/mc/PageStore.hpp"
-#include "mc_protocol.h"
+#include "src/mc/mc_protocol.h"
 
 namespace simgrid {
 namespace mc {
@@ -28,22 +28,20 @@ namespace mc {
 /** State of the model-checker (global variables for the model checker)
  */
 class ModelChecker {
-  pid_t pid_;
-  int socket_;
   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_;
 public:
-  mc_snapshot_t parent_snapshot_;
+  simgrid::mc::Snapshot* parent_snapshot_;
 
 public:
   ModelChecker(ModelChecker const&) = delete;
   ModelChecker& operator=(ModelChecker const&) = delete;
-  ModelChecker(pid_t pid, int socket);
+  ModelChecker(std::unique_ptr<Process> process);
   ~ModelChecker();
 
   Process& process()
@@ -72,6 +70,10 @@ public:
   {
     mc_model_checker->wait_client(mc_model_checker->process());
   }
+  void exit(int status);
+
+  bool checkDeadlock();
+
 private:
   void setup_ignore();
   bool handle_message(char* buffer, ssize_t size);