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

diff --git a/src/mc/Session.hpp b/src/mc/Session.hpp
index 7af4c43229..ab21a05b71 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 {
 
@@ -34,56 +21,36 @@ namespace mc {
  *  algorithms should be able to be written in high-level languages
  *  (e.g. Python) using bindings on this interface.
  */
-class Session {
+class XBT_PUBLIC Session {
 private:
-  std::unique_ptr<ModelChecker> modelChecker_;
-  std::shared_ptr<simgrid::mc::Snapshot> initialSnapshot_;
-
-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:
-  void initialize();
-  void execute(Transition const& transition);
-  void logState();
-
-  void restoreInitialState();
-
-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
-   *  (environoment variables, sockets, etc.).
+   *  (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);
 
-  /** 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[]);
+  ~Session();
+  void close();
 
-  /** 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[]);
+  void initialize();
+  void execute(Transition const& transition);
+  void log_state();
+
+  void restore_initial_state();
 };
 
-// Temporary
+// Temporary :)
 extern simgrid::mc::Session* session;
 
 }