mcapi::s_restore_initial_state() renamed to mcapi::restore_initial_state()

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

diff --git a/src/mc/mc_api.hpp b/src/mc/mc_api.hpp
index 971bbf3..f4aeb89 100644 (file)
--- a/src/mc/mc_api.hpp
+++ b/src/mc/mc_api.hpp
@@ -7,6 +7,7 @@
 #include "simgrid/forward.h"
 #include "src/mc/mc_forward.hpp"
 #include "src/mc/mc_request.hpp"
+#include "src/mc/mc_state.hpp"
 #include "xbt/base.h"
 
 namespace simgrid {
@@ -37,7 +38,30 @@ public:
 
   void initialize(char** argv);
 
-  // MODEL_CHECKER FUNCTIONS
+  // ACTOR APIs  
+  std::vector<simgrid::mc::ActorInformation>& get_actors() const;
+  bool actor_is_enabled(aid_t pid) const;
+  unsigned long get_maxpid() const;
+  int get_actors_size() const;
+
+  // COMMUNICATION APIs
+  void copy_incomplete_comm_pattern(const simgrid::mc::State* state) const;
+  void copy_index_comm_pattern(const simgrid::mc::State* state) const;
+  kernel::activity::CommImpl* get_pattern_comm_addr(smx_simcall_t request) const;
+  std::string get_pattern_comm_rdv(void* addr) const;
+  unsigned long get_pattern_comm_src_proc(void* addr) const;
+  unsigned long get_pattern_comm_dst_proc(void* addr) const;
+  std::vector<char> get_pattern_comm_data(void* addr) const;
+  std::vector<char> get_pattern_comm_data(mc::RemotePtr<kernel::activity::CommImpl> const& comm_addr) const;
+  const char* get_actor_host_name(smx_actor_t actor) const;
+  bool check_send_request_detached(smx_simcall_t const& simcall) const;
+  smx_actor_t get_src_actor(mc::RemotePtr<kernel::activity::CommImpl> const& comm_addr) const;
+  smx_actor_t get_dst_actor(mc::RemotePtr<kernel::activity::CommImpl> const& comm_addr) const;
+
+  // REMOTE APIs
+  std::size_t get_remote_heap_bytes() const;
+
+  // MODEL CHECKER APIs
   ModelChecker* get_model_checker() const;
   void mc_inc_visited_states() const;
   void mc_inc_executed_trans() const;
@@ -46,9 +70,6 @@ public:
   bool mc_check_deadlock() const;
   void mc_show_deadlock() const;
   smx_actor_t mc_smx_simcall_get_issuer(s_smx_simcall const* req) const;
-  std::vector<simgrid::mc::ActorInformation>& get_actors() const;
-  bool actor_is_enabled(aid_t pid) const;
-  void mc_assert(bool notNull, const char* message = "") const;
   bool mc_is_null() const;
   Checker* mc_get_checker() const;
   RemoteSimulation& mc_get_remote_simulation() const;
@@ -56,23 +77,31 @@ public:
   void mc_wait_for_requests() const;
   void mc_exit(int status) const;
   std::string const& mc_get_host_name(std::string const& hostname) const;
-  PageStore& mc_page_store() const;
   void mc_dump_record_path() const;
+  smx_simcall_t mc_state_choose_request(simgrid::mc::State* state) const;
 
-  // SIMCALL FUNCTIONS
+  // SIMCALL APIs
   bool request_depend(smx_simcall_t req1, smx_simcall_t req2) const;
   std::string request_to_string(smx_simcall_t req, int value, RequestType request_type) const;
-  const char *simix_simcall_name(e_smx_simcall_t kind) const;
+  std::string request_get_dot_output(smx_simcall_t req, int value) const;
+  const char *simix_simcall_name(simgrid::simix::Simcall kind) const;
+  #if HAVE_SMPI
+  int get_smpi_request_tag(smx_simcall_t const& simcall, simgrid::simix::Simcall type) const;
+  #endif
+
+  // STATE APIs
+  void restore_state(std::shared_ptr<simgrid::mc::Snapshot> system_state) const;
+  void log_state() const;
+  void restore_initial_state() const;
 
-  // SNAPSHOT FUNCTIONS
+  // SNAPSHOT APIs
   bool snapshot_equal(const Snapshot* s1, const Snapshot* s2) const;
+  simgrid::mc::Snapshot* take_snapshot(int num_state) const;
 
-  // SESSION FUNCTIONS
+  // SESSION APIs
   void s_initialize() const;
   void s_close() const;
-  void s_restore_initial_state() const;
   void execute(Transition const& transition);
-  void s_log_state() const;
 };
 
 } // namespace mc