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 c962d1f..16294c8 100644 (file)
--- a/src/mc/Session.hpp
+++ b/src/mc/Session.hpp
@@ -8,12 +8,12 @@
 
 #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
  *
@@ -46,16 +46,15 @@ public:
   void close();
 
   void take_initial_snapshot();
-  simgrid::mc::RemotePtr<simgrid::kernel::actor::SimcallObserver> execute(Transition const& transition) const;
+  void restore_initial_state() const;
+
+  /** Ask to the application to check for a deadlock. If so, do an error message and throw a DeadlockError. */
+  void check_deadlock() const;
+
   void log_state() const;
 
-  void restore_initial_state() const;
-  bool actor_is_enabled(aid_t pid) const;
+  void get_actors_status(std::map<aid_t, ActorState>& whereto);
 };
-
-// Temporary :)
-extern simgrid::mc::Session* session_singleton;
-}
-}
+} // namespace simgrid::mc
 
 #endif