X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/58d95ccaa27bb984b83885dc0bd37d945d946944..d89ca681772fdaafdd69049d4d66676a4e98de38:/src/mc/Session.hpp

diff --git a/src/mc/Session.hpp b/src/mc/Session.hpp
index 9b7d857c13..c962d1f403 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,22 +6,12 @@
 #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/remote/RemotePtr.hpp"
 
 #include <functional>
 
-#include <xbt/log.h>
-
-#include "src/mc/mc_forward.hpp"
-#include "src/mc/ModelChecker.hpp"
-
 namespace simgrid {
 namespace mc {
 
@@ -34,39 +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_;
-
+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:
-  ~Session();
-  void close();
-
-public: // static constructors
-
-  /** Create a new session by forking
+  /** 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-checker program.
+   *  The code is expected to `exec` the model-checked application.
    */
-  static Session* fork(std::function<void(void)> code);
+  explicit Session(const std::function<void()>& code);
 
-  /** Create a session using `execv` */
-  static Session* spawnv(const char *path, char *const argv[]);
+  ~Session();
+  void close();
 
-  /** Create a session using `execvp` */
-  static Session* spawnvp(const char *path, char *const argv[]);
-};
+  void take_initial_snapshot();
+  simgrid::mc::RemotePtr<simgrid::kernel::actor::SimcallObserver> execute(Transition const& transition) const;
+  void log_state() const;
 
-// Temporary
-extern simgrid::mc::Session* session;
+  void restore_initial_state() const;
+  bool actor_is_enabled(aid_t pid) const;
+};
 
+// Temporary :)
+extern simgrid::mc::Session* session_singleton;
 }
 }