X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cf64c8ceb2027a65be8789e5fb36902e9274be4c..1bf033cc925aa31693ef5163ea056fde5b75ff1e:/src/mc/ModelChecker.hpp

diff --git a/src/mc/ModelChecker.hpp b/src/mc/ModelChecker.hpp
index 6619f25c87..65ad9ada5e 100644
--- a/src/mc/ModelChecker.hpp
+++ b/src/mc/ModelChecker.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2015. The SimGrid Team.
+/* Copyright (c) 2007-2018. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -9,19 +9,20 @@
 
 #include <sys/types.h>
 
-#include <poll.h>
 #include <memory>
+#include <set>
+#include <string>
 
-#include <simgrid_config.h>
-#include <xbt/dict.h>
-#include <xbt/base.h>
+#include <event2/event.h>
+
+#include "xbt/base.h"
 #include <sys/types.h>
 
-#include "src/mc/mc_forward.hpp"
-#include "src/mc/Process.hpp"
 #include "src/mc/PageStore.hpp"
-#include "src/mc/mc_protocol.h"
 #include "src/mc/Transition.hpp"
+#include "src/mc/mc_forward.hpp"
+#include "src/mc/remote/RemoteClient.hpp"
+#include "src/mc/remote/mc_protocol.h"
 
 namespace simgrid {
 namespace mc {
@@ -29,44 +30,46 @@ 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_;
+  struct 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_;
+  std::unique_ptr<RemoteClient> process_;
   Checker* checker_ = nullptr;
 public:
   std::shared_ptr<simgrid::mc::Snapshot> parent_snapshot_;
 
-public:
   ModelChecker(ModelChecker const&) = delete;
   ModelChecker& operator=(ModelChecker const&) = delete;
-  ModelChecker(std::unique_ptr<Process> process);
+  explicit ModelChecker(std::unique_ptr<RemoteClient> process);
   ~ModelChecker();
 
-  Process& process()
-  {
-    return *process_;
-  }
+  RemoteClient& process() { return *process_; }
   PageStore& page_store()
   {
     return page_store_;
   }
-  const char* get_host_name(const char* name);
+
+  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 *this->hostnames_.insert(hostname).first;
+  }
 
   void start();
   void shutdown();
-  void resume(simgrid::mc::Process& process);
+  void resume(simgrid::mc::RemoteClient& process);
   void loop();
-  bool handle_events();
-  void wait_client(simgrid::mc::Process& process);
+  void handle_events(int fd, short events);
+  void wait_for_requests();
   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();
@@ -77,9 +80,8 @@ 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;