X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/218c42a20c7eaba87e20cfb3eaac5ad8e0d0f739..28b9e83a90c238b71d27f5cb3c6596906a3d4641:/src/mc/ModelChecker.hpp

diff --git a/src/mc/ModelChecker.hpp b/src/mc/ModelChecker.hpp
index 64db962276..0d51e9e236 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-2023. 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,59 +6,44 @@
 #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/remote/RemotePtr.hpp"
+#include "src/mc/sosp/PageStore.hpp"
+#include "xbt/base.h"
 
-#include <simgrid_config.h>
-#include <xbt/dict.h>
-#include <xbt/base.h>
+#include <memory>
 
-#include "mc_forward.hpp"
-#include "mc/Process.hpp"
-#include "mc/PageStore.hpp"
-#include "mc_protocol.h"
-
-namespace simgrid {
-namespace mc {
+namespace simgrid::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 {
-  /** String pool for host names */
-  // TODO, use std::unordered_set with heterogeneous comparison lookup (C++14)
-  xbt_dict_t /* <hostname, NULL> */ hostnames_;
-  // This is the parent snapshot of the current state:
-  PageStore page_store_;
-  Process process_;
-public:
-  mc_snapshot_t parent_snapshot_;
+  CheckerSide checker_side_;
+  std::unique_ptr<RemoteProcessMemory> remote_process_memory_;
+  Exploration* exploration_ = nullptr;
 
 public:
   ModelChecker(ModelChecker const&) = delete;
   ModelChecker& operator=(ModelChecker const&) = delete;
-  ModelChecker(pid_t pid, int socket);
-  ~ModelChecker();
-  Process& process()
-  {
-    return process_;
-  }
-  PageStore& page_store()
-  {
-    return page_store_;
-  }
-  const char* get_host_name(const char* name);
+  explicit ModelChecker(std::unique_ptr<RemoteProcessMemory> remote_simulation, int sockfd);
+
+  RemoteProcessMemory& get_remote_process_memory() { return *remote_process_memory_; }
+  Channel& get_channel() { return checker_side_.get_channel(); }
+  void channel_handle_events() { checker_side_.dispatch(); }
+
+  void start();
+
+  /** Let the application take a transition. A new Transition is created iff the last parameter is true */
+  Transition* handle_simcall(aid_t aid, int times_considered, bool new_transition);
+
+  Exploration* get_exploration() const { return exploration_; }
+  void set_exploration(Exploration* exploration) { exploration_ = exploration; }
 
-  bool is_important_snapshot(Snapshot const& snapshot) const
-  {
-    return &snapshot == this->parent_snapshot_;
-  }
+private:
+  bool handle_message(const char* buffer, ssize_t size);
+  void handle_waitpid();
 };
 
-}
-}
+} // namespace simgrid::mc
 
 #endif