X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/de0765cca8da736799b534113602a9cb8bc32809..121e1dc6ee0462b6f6f1f1570b0f48c61ee4ff9a:/src/mc/ModelChecker.hpp

diff --git a/src/mc/ModelChecker.hpp b/src/mc/ModelChecker.hpp
index eaed239e9f..82724c4740 100644
--- a/src/mc/ModelChecker.hpp
+++ b/src/mc/ModelChecker.hpp
@@ -9,18 +9,21 @@
 
 #include <sys/types.h>
 
-#include <poll.h>
 #include <memory>
+#include <set>
+#include <string>
+
+#include <event2/event.h>
 
 #include <simgrid_config.h>
-#include <xbt/dict.h>
 #include <xbt/base.h>
 #include <sys/types.h>
 
-#include "mc_forward.hpp"
-#include "src/mc/Process.hpp"
 #include "src/mc/PageStore.hpp"
-#include "mc_protocol.h"
+#include "src/mc/Process.hpp"
+#include "src/mc/Transition.hpp"
+#include "src/mc/mc_forward.hpp"
+#include "src/mc/remote/mc_protocol.h"
 
 namespace simgrid {
 namespace mc {
@@ -28,22 +31,22 @@ namespace mc {
 /** State of the model-checker (global variables for the model checker)
  */
 class ModelChecker {
-  pid_t pid_;
-  int socket_;
-  struct pollfd fds_[2];
+  struct event_base *base_;
+  struct event *socket_event_, *signal_event_;
   /** 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)?
+  std::set<std::string> 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;
   ModelChecker& operator=(ModelChecker const&) = delete;
-  ModelChecker(pid_t pid, int socket);
+  ModelChecker(std::unique_ptr<Process> process);
   ~ModelChecker();
 
   Process& process()
@@ -54,27 +57,43 @@ public:
   {
     return page_store_;
   }
-  const char* get_host_name(const char* name);
 
-  bool is_important_snapshot(Snapshot const& snapshot) const
+  std::string const& get_host_name(const char* hostname)
   {
-    return &snapshot == this->parent_snapshot_;
+    return *this->hostnames_.insert(hostname).first;
+  }
+  std::string const& get_host_name(std::string const& hostname)
+  {
+    return *this->hostnames_.insert(hostname).first;
   }
 
   void start();
   void shutdown();
   void resume(simgrid::mc::Process& process);
   void loop();
-  bool handle_events();
+  void handle_events(int fd, short events);
   void wait_client(simgrid::mc::Process& process);
-  void simcall_handle(simgrid::mc::Process& process, unsigned long pid, int value);
+  void handle_simcall(Transition const& transition);
+  void wait_for_requests()
+  {
+    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);
-  void handle_signals();
   void handle_waitpid();
-  void on_signal(const struct signalfd_siginfo* info);
+  void on_signal(int signo);
 
+public:
+  unsigned long visited_states = 0;
+  unsigned long executed_transitions = 0;
 };
 
 }