X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/58d95ccaa27bb984b83885dc0bd37d945d946944..8cf6e30af8de6686461b6b1b52ba578df01de985:/src/mc/ModelChecker.hpp

diff --git a/src/mc/ModelChecker.hpp b/src/mc/ModelChecker.hpp
index a53e99a86a..a1138ce0ea 100644
--- a/src/mc/ModelChecker.hpp
+++ b/src/mc/ModelChecker.hpp
@@ -9,11 +9,13 @@
 
 #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>
 
@@ -21,6 +23,7 @@
 #include "src/mc/Process.hpp"
 #include "src/mc/PageStore.hpp"
 #include "src/mc/mc_protocol.h"
+#include "src/mc/Transition.hpp"
 
 namespace simgrid {
 namespace mc {
@@ -28,16 +31,17 @@ namespace mc {
 /** State of the model-checker (global variables for the model checker)
  */
 class ModelChecker {
-  struct pollfd fds_[2];
+  struct event_base *base_;
+  struct event *socket_event_, *signal_event_;
   /** String pool for host names */
   // TODO, use std::set with heterogeneous comparison lookup (C++14)?
-  xbt_dict_t /* <hostname, nullptr> */ hostnames_;
+  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:
-  simgrid::mc::Snapshot* parent_snapshot_;
+  std::shared_ptr<simgrid::mc::Snapshot> parent_snapshot_;
 
 public:
   ModelChecker(ModelChecker const&) = delete;
@@ -53,20 +57,23 @@ 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 *this->hostnames_.insert(hostname).first;
+  }
+  std::string const& get_host_name(std::string const& hostname)
   {
-    return &snapshot == this->parent_snapshot_;
+    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());
@@ -81,10 +88,12 @@ public:
 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;
 };
 
 }