Move dot_label() from Observer to Transition (+ some reorgs)

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

diff --git a/src/mc/api.hpp b/src/mc/api.hpp
index 500967a..9da3c6d 100644 (file)
--- a/src/mc/api.hpp
+++ b/src/mc/api.hpp
@@ -10,9 +10,9 @@
 #include <vector>
 
 #include "simgrid/forward.h"
+#include "src/mc/api/State.hpp"
 #include "src/mc/mc_forward.hpp"
 #include "src/mc/mc_record.hpp"
-#include "src/mc/mc_state.hpp"
 #include "xbt/automaton.hpp"
 #include "xbt/base.h"
 
@@ -52,7 +52,6 @@ private:
     }
   };
 
-  simgrid::kernel::activity::CommImpl* get_comm_or_nullptr(smx_simcall_t const r) const;
   bool request_depend_asymmetric(smx_simcall_t r1, smx_simcall_t r2) const;
   simgrid::mc::ActorInformation* actor_info_cast(smx_actor_t actor) const;
 
@@ -97,24 +96,12 @@ public:
 
   // MODEL CHECKER APIs
   void mc_inc_visited_states() const;
-  void mc_inc_executed_trans() const;
   unsigned long mc_get_visited_states() const;
-  unsigned long mc_get_executed_trans() const;
   void mc_check_deadlock() const;
-  void handle_simcall(Transition const& transition) const;
-  void mc_wait_for_requests() const;
   XBT_ATTRIB_NORETURN void mc_exit(int status) const;
-  void dump_record_path() const;
-  smx_simcall_t mc_state_choose_request(simgrid::mc::State* state) const;
-
-  // UDPOR APIs
-  std::list<transition_detail_t> get_enabled_transitions(simgrid::mc::State* state) const;
 
   // SIMCALL APIs
-  bool requests_are_dependent(RemotePtr<kernel::actor::SimcallObserver> obs1,
-                              RemotePtr<kernel::actor::SimcallObserver> obs2) const;
-  std::string request_to_string(smx_simcall_t req, int value) const;
-  std::string request_get_dot_output(smx_simcall_t req, int value) const;
+  std::string request_get_dot_output(const Transition* t) const;
   smx_actor_t simcall_get_issuer(s_smx_simcall const* req) const;
   RemotePtr<kernel::activity::MailboxImpl> get_mbox_remote_addr(smx_simcall_t const req) const;
   RemotePtr<kernel::activity::ActivityImpl> get_comm_remote_addr(smx_simcall_t const req) const;
@@ -129,11 +116,10 @@ public:
 
   // SNAPSHOT APIs
   bool snapshot_equal(const Snapshot* s1, const Snapshot* s2) const;
-  simgrid::mc::Snapshot* take_snapshot(int num_state) const;
+  simgrid::mc::Snapshot* take_snapshot(long num_state) const;
 
   // SESSION APIs
   void s_close() const;
-  RemotePtr<simgrid::kernel::actor::SimcallObserver> execute(Transition& transition, smx_simcall_t simcall) const;
 
 // AUTOMATION APIs
 #if SIMGRID_HAVE_MC