X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6911eb2e056c44491f399b63c663f4b897aaba76..8b0d5ae29ebd13e69a23991b8adfb67c5c5d79d3:/src/mc/Session.hpp

diff --git a/src/mc/Session.hpp b/src/mc/Session.hpp
index 23e3eaa6f2..6806c0c6cb 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-2019. 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,10 @@
 #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 "src/mc/ModelChecker.hpp"
 
 #include <functional>
 
-#include <xbt/log.h>
-
-#include "src/mc/mc_forward.hpp"
-#include "src/mc/ModelChecker.hpp"
-
 namespace simgrid {
 namespace mc {
 
@@ -37,8 +24,8 @@ namespace mc {
 class Session {
 private:
   std::unique_ptr<ModelChecker> modelChecker_;
+  std::shared_ptr<simgrid::mc::Snapshot> initialSnapshot_;
 
-private:
   Session(pid_t pid, int socket);
 
   // No copy:
@@ -49,25 +36,39 @@ public:
   ~Session();
   void close();
 
-public:
+  void initialize();
   void execute(Transition const& transition);
+  void logState();
+
+  void restoreInitialState();
 
-public: // static constructors
+  // static constructors
 
   /** Create a new session by forking
+   *
+   *  This sets up the environment for the model-checked process
+   *  (environment variables, sockets, etc.).
    *
    *  The code is expected to `exec` the model-checker program.
    */
-  static Session* fork(std::function<void(void)> code);
+  static Session* fork(const std::function<void()>& code);
 
-  /** Create a session using `execv` */
+  /** Spawn a model-checked process
+   *
+   *  @param path full path of the executable
+   *  @param argv arguments for the model-checked process (NULL-terminated)
+   */
   static Session* spawnv(const char *path, char *const argv[]);
 
-  /** Create a session using `execvp` */
-  static Session* spawnvp(const char *path, char *const argv[]);
+  /** Spawn a model-checked process (using PATH)
+   *
+   *  @param file file name of the executable (found using `PATH`)
+   *  @param argv arguments for the model-checked process (NULL-terminated)
+   */
+  static Session* spawnvp(const char *file, char *const argv[]);
 };
 
-// Temporary
+// Temporary :)
 extern simgrid::mc::Session* session;
 
 }