X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/bd031688c75b0120d21a705ae3ee325ca0718530..ebadbf7894190d4c66238842db5f8931adb7df5b:/src/mc/ModelChecker.hpp

diff --git a/src/mc/ModelChecker.hpp b/src/mc/ModelChecker.hpp
index d4de670021..8bf67d31d1 100644
--- a/src/mc/ModelChecker.hpp
+++ b/src/mc/ModelChecker.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2019. 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. */
@@ -6,19 +6,14 @@
 #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 "xbt/string.hpp"
 
 #include <memory>
 #include <set>
-#include <string>
-
-#include <event2/event.h>
-
-#include <sys/types.h>
-
-#include "src/mc/mc_forward.hpp"
-#include "src/mc/remote/mc_protocol.h"
-#include "src/mc/sosp/PageStore.hpp"
 
 namespace simgrid {
 namespace mc {
@@ -26,62 +21,54 @@ namespace mc {
 /** State of the model-checker (global variables for the model checker)
  */
 class ModelChecker {
-  struct event_base *base_;
-  struct event* socket_event_;
-  struct event* signal_event_;
+  CheckerSide checker_side_;
   /** String pool for host names */
-  // TODO, use std::set with heterogeneous comparison lookup (C++14)?
-  std::set<std::string> hostnames_;
+  std::set<xbt::string, std::less<>> hostnames_;
   // This is the parent snapshot of the current state:
-  PageStore page_store_;
-  std::unique_ptr<RemoteClient> process_;
-  Checker* checker_ = nullptr;
-public:
-  std::shared_ptr<simgrid::mc::Snapshot> parent_snapshot_;
+  PageStore page_store_{500};
+  std::unique_ptr<RemoteProcess> remote_process_;
+  Exploration* exploration_ = 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<RemoteClient> process);
-  ~ModelChecker();
+  explicit ModelChecker(std::unique_ptr<RemoteProcess> remote_simulation, int sockfd);
 
-  RemoteClient& process() { return *process_; }
-  PageStore& page_store()
-  {
-    return page_store_;
-  }
+  RemoteProcess& get_remote_process() { return *remote_process_; }
+  Channel& channel() { return checker_side_.get_channel(); }
+  PageStore& page_store() { return page_store_; }
 
-  std::string const& get_host_name(const char* hostname)
+  xbt::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;
+    return *this->hostnames_.insert(xbt::string(hostname)).first;
   }
 
   void start();
   void shutdown();
-  void resume(simgrid::mc::RemoteClient& process);
-  void loop();
-  void handle_events(int fd, short events);
+  void resume();
   void wait_for_requests();
-  void handle_simcall(Transition const& transition);
+
+  /** 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);
+
+  /* Interactions with the simcall observer */
   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; }
+  Exploration* get_exploration() const { return exploration_; }
+  void set_exploration(Exploration* exploration) { exploration_ = exploration; }
 
 private:
   void setup_ignore();
-  bool handle_message(char* buffer, ssize_t size);
+  bool handle_message(const char* buffer, ssize_t size);
   void handle_waitpid();
-  void on_signal(int signo);
 
 public:
   unsigned long visited_states = 0;
-  unsigned long executed_transitions = 0;
 };
 
 }