X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2945198502e436f29236715c0baca1efadb64480..7b4766bf670b8042a39700c3f27e61b82db3d6cd:/src/mc/Session.hpp

diff --git a/src/mc/Session.hpp b/src/mc/Session.hpp
index 11afedaf22..16294c87c4 100644
--- a/src/mc/Session.hpp
+++ b/src/mc/Session.hpp
@@ -1,5 +1,4 @@
-/* Copyright (c) 2016. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2016-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,24 +6,14 @@
 #ifndef SIMGRID_MC_SESSION_HPP
 #define SIMGRID_MC_SESSION_HPP
 
-#ifdef __linux__
-#include <sys/prctl.h>
-#endif
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <xbt/sysdep.h>
-#include <xbt/system_error.hpp>
+#include "simgrid/forward.h"
+#include "src/mc/ModelChecker.hpp"
+#include "src/mc/api/ActorState.hpp"
+#include "src/mc/remote/RemotePtr.hpp"
 
 #include <functional>
 
-#include <xbt/log.h>
-
-#include "src/mc/mc_forward.hpp"
-#include "src/mc/ModelChecker.hpp"
-
-namespace simgrid {
-namespace mc {
+namespace simgrid::mc {
 
 /** A model-checking session
  *
@@ -34,48 +23,38 @@ namespace mc {
  *  algorithms should be able to be written in high-level languages
  *  (e.g. Python) using bindings on this interface.
  */
-class Session {
-private:
-  std::unique_ptr<ModelChecker> modelChecker_;
-  std::shared_ptr<simgrid::mc::Snapshot> initialSnapshot_;
-
+class XBT_PUBLIC Session {
 private:
-  Session(pid_t pid, int socket);
+  std::unique_ptr<ModelChecker> model_checker_;
+  std::shared_ptr<simgrid::mc::Snapshot> initial_snapshot_;
 
   // No copy:
   Session(Session const&) = delete;
   Session& operator=(Session const&) = delete;
 
 public:
+  /** Create a new session by executing the provided code in a fork()
+   *
+   *  This sets up the environment for the model-checked process
+   *  (environment variables, sockets, etc.).
+   *
+   *  The code is expected to `exec` the model-checked application.
+   */
+  explicit Session(const std::function<void()>& code);
+
   ~Session();
   void close();
 
-public:
-  void initialize();
-  void execute(Transition const& transition);
-  void logState();
+  void take_initial_snapshot();
+  void restore_initial_state() const;
 
-  void restoreInitialState();
+  /** Ask to the application to check for a deadlock. If so, do an error message and throw a DeadlockError. */
+  void check_deadlock() const;
 
-public: // static constructors
+  void log_state() const;
 
-  /** Create a new session by forking
-   *
-   *  The code is expected to `exec` the model-checker program.
-   */
-  static Session* fork(std::function<void(void)> code);
-
-  /** Create a session using `execv` */
-  static Session* spawnv(const char *path, char *const argv[]);
-
-  /** Create a session using `execvp` */
-  static Session* spawnvp(const char *path, char *const argv[]);
+  void get_actors_status(std::map<aid_t, ActorState>& whereto);
 };
-
-// Temporary
-extern simgrid::mc::Session* session;
-
-}
-}
+} // namespace simgrid::mc
 
 #endif