Move handle_waitpid from ModelChecker to RemoteProcessMemory

[simgrid.git] / src / mc / ModelChecker.hpp

diff --git a/src/mc/ModelChecker.hpp b/src/mc/ModelChecker.hpp
index ab99ea5eeeac32846fc57b4a54aba8e7f4de0594..d75a38d4ba29a97618a6d2ff3a6312160d814bb1 100644 (file)
--- a/src/mc/ModelChecker.hpp
+++ b/src/mc/ModelChecker.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2022. 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. */
@@ -10,71 +10,26 @@
 #include "src/mc/remote/RemotePtr.hpp"
 #include "src/mc/sosp/PageStore.hpp"
 #include "xbt/base.h"
-#include "xbt/string.hpp"
 
 #include <memory>
-#include <set>
 
-namespace simgrid {
-namespace mc {
+namespace simgrid::mc {
 
 /** State of the model-checker (global variables for the model checker)
  */
 class ModelChecker {
-  CheckerSide checker_side_;
-  /** String pool for host names */
-  std::set<xbt::string, std::less<>> hostnames_;
-  // This is the parent snapshot of the current state:
-  PageStore page_store_{500};
-  std::unique_ptr<RemoteProcess> remote_process_;
-  Checker* checker_ = nullptr;
-
-  // Expect MessageType::SIMCALL_TO_STRING or MessageType::SIMCALL_DOT_LABEL
-  std::string simcall_to_string(MessageType type, aid_t aid, int times_considered);
+  std::unique_ptr<RemoteProcessMemory> remote_process_memory_;
 
 public:
   ModelChecker(ModelChecker const&) = delete;
   ModelChecker& operator=(ModelChecker const&) = delete;
-  explicit ModelChecker(std::unique_ptr<RemoteProcess> remote_simulation, int sockfd);
-
-  RemoteProcess& get_remote_process() { return *remote_process_; }
-  Channel& channel() { return checker_side_.get_channel(); }
-  PageStore& page_store() { return page_store_; }
-
-  xbt::string const& get_host_name(const char* hostname)
-  {
-    return *this->hostnames_.insert(xbt::string(hostname)).first;
-  }
-
-  void start();
-  void shutdown();
-  void resume();
-  void wait_for_requests();
-
-  /** 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);
+  explicit ModelChecker(std::unique_ptr<RemoteProcessMemory> remote_simulation);
 
-  /* Interactions with the simcall observer */
-  bool simcall_is_visible(aid_t aid);
+  RemoteProcessMemory& get_remote_process_memory() { return *remote_process_memory_; }
 
-  XBT_ATTRIB_NORETURN void exit(int status);
-
-  bool checkDeadlock();
-  void finalize_app(bool terminate_asap = false);
-
-  Checker* getChecker() const { return checker_; }
-  void setChecker(Checker* checker) { checker_ = checker; }
-
-private:
-  void setup_ignore();
-  bool handle_message(const char* buffer, ssize_t size);
-  void handle_waitpid();
-
-public:
-  unsigned long visited_states = 0;
+  bool handle_message(const char* buffer, ssize_t size); // FIXME move to RemoteApp
 };
 
-}
-}
+} // namespace simgrid::mc
 
 #endif