Update copyright lines for 2022.

[simgrid.git] / src / mc / Session.hpp

diff --git a/src/mc/Session.hpp b/src/mc/Session.hpp
index 283366c..a639246 100644 (file)
--- a/src/mc/Session.hpp
+++ b/src/mc/Session.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2016-2019. 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. */
@@ -6,6 +6,7 @@
 #ifndef SIMGRID_MC_SESSION_HPP
 #define SIMGRID_MC_SESSION_HPP
 
+#include "simgrid/forward.h"
 #include "src/mc/ModelChecker.hpp"
 
 #include <functional>
@@ -21,56 +22,38 @@ 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> model_checker_;
   std::shared_ptr<simgrid::mc::Snapshot> initial_snapshot_;
 
-  Session(pid_t pid, int socket);
-
   // No copy:
   Session(Session const&) = delete;
   Session& operator=(Session const&) = delete;
 
 public:
-  ~Session();
-  void close();
-
-  void initialize();
-  void execute(Transition const& transition);
-  void log_state();
-
-  void restore_initial_state();
-
-  // 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(const std::function<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 take_initial_snapshot();
+  void execute(Transition const& transition) const;
+  void log_state() const;
+
+  void restore_initial_state() const;
+  bool actor_is_enabled(aid_t pid) const;
 };
 
 // Temporary :)
-extern simgrid::mc::Session* session;
-
+extern simgrid::mc::Session* session_singleton;
 }
 }