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

diff --git a/src/mc/ModelChecker.hpp b/src/mc/ModelChecker.hpp
index 5c3f50c0eb..ab99ea5eee 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-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,48 +6,72 @@
 #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 <simgrid_config.h>
-#include <xbt/dict.h>
-#include <xbt/base.h>
-
-#include "mc_forward.hpp"
-#include "mc_process.h"
-#include "PageStore.hpp"
-#include "mc_protocol.h"
+#include <memory>
+#include <set>
 
 namespace simgrid {
 namespace 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 {
+  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<xbt::string, std::less<>> hostnames_;
   // This is the parent snapshot of the current state:
-  PageStore page_store_;
-  Process process_;
+  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);
+
 public:
   ModelChecker(ModelChecker const&) = delete;
   ModelChecker& operator=(ModelChecker const&) = delete;
-  ModelChecker(pid_t pid, int socket);
-  ~ModelChecker();
-  Process& process()
-  {
-    return process_;
-  }
-  PageStore& page_store()
+  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 page_store_;
+    return *this->hostnames_.insert(xbt::string(hostname)).first;
   }
-  const char* get_host_name(const char* name);
+
+  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);
+
+  /* Interactions with the simcall observer */
+  bool simcall_is_visible(aid_t aid);
+
+  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;
 };
 
 }