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

diff --git a/src/mc/ModelChecker.hpp b/src/mc/ModelChecker.hpp
index 846ea2ba96..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,49 +9,83 @@
 
 #include <sys/types.h>
 
-#include <simgrid_config.h>
-#include <xbt/dict.h>
-#include <xbt/base.h>
+#include <memory>
+#include <set>
+#include <string>
 
-#include "mc_forward.hpp"
-#include "mc_process.h"
-#include "PageStore.hpp"
-#include "mc_protocol.h"
+#include <event2/event.h>
+
+#include "xbt/base.h"
+#include <sys/types.h>
+
+#include "src/mc/PageStore.hpp"
+#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 {
 
 /** 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 {
+  struct event_base *base_;
+  struct event* socket_event_;
+  struct 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_;
-  Process process_;
+  std::unique_ptr<RemoteClient> 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);
+  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::RemoteClient& process);
+  void loop();
+  void handle_events(int fd, short events);
+  void wait_for_requests();
+  void handle_simcall(Transition const& transition);
+  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_waitpid();
+  void on_signal(int signo);
+
+public:
+  unsigned long visited_states = 0;
+  unsigned long executed_transitions = 0;
 };
 
 }