X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3203ed1f4fb6f4617e94d5351661ba07e8b8f833..347996b4a10c4e8579080692afa60e0afb88b60a:/src/mc/ModelChecker.hpp

diff --git a/src/mc/ModelChecker.hpp b/src/mc/ModelChecker.hpp
index c9e58d9efd..a90e1b4137 100644
--- a/src/mc/ModelChecker.hpp
+++ b/src/mc/ModelChecker.hpp
@@ -9,32 +9,34 @@
 
 #include <sys/types.h>
 
+#include <poll.h>
+#include <memory>
+
 #include <simgrid_config.h>
 #include <xbt/dict.h>
 #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 {
 
 /** State of the model-checker (global variables for the model checker)
- *
- *  Each part of the state of the model chercker represented as a global
- *  variable prevents some sharing between snapshots and must be ignored.
- *  By moving as much state as possible in this structure allocated
- *  on the model-checker heap, we avoid those issues.
  */
 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_;
   // This is the parent snapshot of the current state:
   PageStore page_store_;
-  Process process_;
+  std::unique_ptr<Process> process_;
 public:
   mc_snapshot_t parent_snapshot_;
 
@@ -43,9 +45,10 @@ public:
   ModelChecker& operator=(ModelChecker const&) = delete;
   ModelChecker(pid_t pid, int socket);
   ~ModelChecker();
+
   Process& process()
   {
-    return process_;
+    return *process_;
   }
   PageStore& page_store()
   {
@@ -57,6 +60,26 @@ public:
   {
     return &snapshot == this->parent_snapshot_;
   }
+
+  void start();
+  void init_process();
+  void shutdown();
+  void resume(simgrid::mc::Process& process);
+  void loop();
+  bool handle_events();
+  void wait_client(simgrid::mc::Process& process);
+  void simcall_handle(simgrid::mc::Process& process, unsigned long pid, int value);
+  void wait_for_requests()
+  {
+    mc_model_checker->wait_client(mc_model_checker->process());
+  }
+private:
+  void setup_ignore();
+  bool handle_message(char* buffer, ssize_t size);
+  void handle_signals();
+  void handle_waitpid();
+  void on_signal(const struct signalfd_siginfo* info);
+
 };
 
 }