X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2dab73b61a6ad4feb7d2d267bf5621c7b95926b3..d89ca681772fdaafdd69049d4d66676a4e98de38:/src/mc/ModelChecker.hpp

diff --git a/src/mc/ModelChecker.hpp b/src/mc/ModelChecker.hpp
index cf5c3c6515..486145a670 100644
--- a/src/mc/ModelChecker.hpp
+++ b/src/mc/ModelChecker.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2020. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2022. 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,12 +7,13 @@
 #define SIMGRID_MC_MODEL_CHECKER_HPP
 
 #include "src/mc/remote/CheckerSide.hpp"
+#include "src/mc/remote/RemotePtr.hpp"
 #include "src/mc/sosp/PageStore.hpp"
 #include "xbt/base.h"
+#include "xbt/string.hpp"
 
 #include <memory>
 #include <set>
-#include <string>
 
 namespace simgrid {
 namespace mc {
@@ -22,39 +23,46 @@ namespace mc {
 class ModelChecker {
   CheckerSide checker_side_;
   /** String pool for host names */
-  std::set<std::string> hostnames_;
+  std::set<xbt::string, std::less<>> hostnames_;
   // This is the parent snapshot of the current state:
   PageStore page_store_{500};
-  std::unique_ptr<RemoteSimulation> remote_simulation_;
+  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);
+
 public:
   ModelChecker(ModelChecker const&) = delete;
   ModelChecker& operator=(ModelChecker const&) = delete;
-  explicit ModelChecker(std::unique_ptr<RemoteSimulation> remote_simulation, int sockfd);
+  explicit ModelChecker(std::unique_ptr<RemoteProcess> remote_simulation, int sockfd);
 
-  RemoteSimulation& get_remote_simulation() { return *remote_simulation_; }
+  RemoteProcess& get_remote_process() { return *remote_process_; }
   Channel& channel() { return checker_side_.get_channel(); }
-  PageStore& page_store()
-  {
-    return page_store_;
-  }
+  PageStore& page_store() { return page_store_; }
 
-  std::string const& get_host_name(std::string const& hostname)
+  xbt::string const& get_host_name(const char* hostname)
   {
-    return *this->hostnames_.insert(hostname).first;
+    return *this->hostnames_.insert(xbt::string(hostname)).first;
   }
 
   void start();
   void shutdown();
-  void resume(simgrid::mc::RemoteSimulation& get_remote_simulation);
-  void handle_events(int fd, short events);
+  void resume();
   void wait_for_requests();
-  void handle_simcall(Transition const& transition);
+  RemotePtr<simgrid::kernel::actor::SimcallObserver> handle_simcall(Transition const& transition);
+
+  /* Interactions with the simcall observer */
+  bool simcall_is_visible(aid_t aid);
+  bool requests_are_dependent(RemotePtr<kernel::actor::SimcallObserver> obs1,
+                              RemotePtr<kernel::actor::SimcallObserver> obs2) const;
+  std::string simcall_to_string(aid_t aid, int times_considered);
+  std::string simcall_dot_label(aid_t aid, int times_considered);
 
   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; }