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

diff --git a/src/mc/ModelChecker.hpp b/src/mc/ModelChecker.hpp
index c238d12c20..d5016d3287 100644
--- a/src/mc/ModelChecker.hpp
+++ b/src/mc/ModelChecker.hpp
@@ -1,5 +1,4 @@
-/* Copyright (c) 2007-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2007-2019. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -7,7 +6,8 @@
 #ifndef SIMGRID_MC_MODEL_CHECKER_HPP
 #define SIMGRID_MC_MODEL_CHECKER_HPP
 
-#include <sys/types.h>
+#include "src/mc/sosp/PageStore.hpp"
+#include "xbt/base.h"
 
 #include <memory>
 #include <set>
@@ -15,15 +15,6 @@
 
 #include <event2/event.h>
 
-#include "xbt/base.h"
-#include <sys/types.h>
-
-#include "src/mc/PageStore.hpp"
-#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 {
 
@@ -38,30 +29,21 @@ class ModelChecker {
   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;
-  explicit 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_;
   }
 
-  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;
@@ -69,16 +51,12 @@ public:
 
   void start();
   void shutdown();
-  void resume(simgrid::mc::Process& process);
+  void resume(simgrid::mc::RemoteClient& process);
   void loop();
   void handle_events(int fd, short events);
-  void wait_client(simgrid::mc::Process& process);
+  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);
+  XBT_ATTRIB_NORETURN void exit(int status);
 
   bool checkDeadlock();