MC further cleanups (let it compile, this time)

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

diff --git a/src/mc/Session.hpp b/src/mc/Session.hpp
index ecdb31d..16294c8 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,12 +6,14 @@
 #ifndef SIMGRID_MC_SESSION_HPP
 #define SIMGRID_MC_SESSION_HPP
 
+#include "simgrid/forward.h"
 #include "src/mc/ModelChecker.hpp"
+#include "src/mc/api/ActorState.hpp"
+#include "src/mc/remote/RemotePtr.hpp"
 
 #include <functional>
 
-namespace simgrid {
-namespace mc {
+namespace simgrid::mc {
 
 /** A model-checking session
  *
@@ -21,7 +23,7 @@ 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_;
@@ -43,17 +45,16 @@ public:
   ~Session();
   void close();
 
-  void initialize();
-  void execute(Transition const& transition);
-  void log_state();
+  void take_initial_snapshot();
+  void restore_initial_state() const;
 
-  void restore_initial_state();
-};
+  /** Ask to the application to check for a deadlock. If so, do an error message and throw a DeadlockError. */
+  void check_deadlock() const;
 
-// Temporary :)
-extern simgrid::mc::Session* session;
+  void log_state() const;
 
-}
-}
+  void get_actors_status(std::map<aid_t, ActorState>& whereto);
+};
+} // namespace simgrid::mc
 
 #endif