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

diff --git a/src/mc/ModelChecker.hpp b/src/mc/ModelChecker.hpp
index ee1a9553bf..cacf530f9b 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-2021. 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,20 +6,13 @@
 #ifndef SIMGRID_MC_MODEL_CHECKER_HPP
 #define SIMGRID_MC_MODEL_CHECKER_HPP
 
-#include <sys/types.h>
+#include "src/mc/remote/CheckerSide.hpp"
+#include "src/mc/sosp/PageStore.hpp"
+#include "xbt/base.h"
 
-#include <poll.h>
 #include <memory>
-
-#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 <set>
+#include <string>
 
 namespace simgrid {
 namespace mc {
@@ -28,57 +20,52 @@ namespace mc {
 /** State of the model-checker (global variables for the model checker)
  */
 class ModelChecker {
-  pid_t pid_;
-  int socket_;
-  struct pollfd fds_[2];
+  CheckerSide checker_side_;
   /** String pool for host names */
-  // TODO, use std::unordered_set with heterogeneous comparison lookup (C++14)
-  xbt_dict_t /* <hostname, NULL> */ hostnames_;
+  std::set<std::string, std::less<>> hostnames_;
   // This is the parent snapshot of the current state:
-  PageStore page_store_;
-  std::unique_ptr<Process> process_;
-public:
-  mc_snapshot_t parent_snapshot_;
+  PageStore page_store_{500};
+  std::unique_ptr<RemoteSimulation> remote_simulation_;
+  Checker* checker_ = nullptr;
 
 public:
   ModelChecker(ModelChecker const&) = delete;
   ModelChecker& operator=(ModelChecker const&) = delete;
-  ModelChecker(pid_t pid, int socket);
-  ~ModelChecker();
+  explicit ModelChecker(std::unique_ptr<RemoteSimulation> remote_simulation, int sockfd);
 
-  Process& process()
-  {
-    return *process_;
-  }
+  RemoteSimulation& get_remote_simulation() { return *remote_simulation_; }
+  Channel& channel() { return checker_side_.get_channel(); }
   PageStore& page_store()
   {
     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(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 wait_client(simgrid::mc::Process& process);
-  void simcall_handle(simgrid::mc::Process& process, unsigned long pid, int value);
-  void wait_for_requests()
-  {
-    mc_model_checker->wait_client(mc_model_checker->process());
-  }
+  void resume(simgrid::mc::RemoteSimulation& get_remote_simulation);
+  void wait_for_requests();
+  void handle_simcall(Transition const& transition);
+
+  XBT_ATTRIB_NORETURN 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();
+  bool handle_message(const char* buffer, ssize_t size);
   void handle_waitpid();
-  void on_signal(const struct signalfd_siginfo* info);
 
+public:
+  unsigned long visited_states = 0;
+  unsigned long executed_transitions = 0;
 };
 
 }