Merge branch 'master' of framagit.org:simgrid/simgrid

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

diff --git a/src/mc/api.hpp b/src/mc/api.hpp
index a425bc42939391f51b9ff2f29fe596a6801e5e36..07ec4bedf6775abd58d5efe208a0c52fbec0e4fd 100644 (file)
--- a/src/mc/api.hpp
+++ b/src/mc/api.hpp
@@ -46,7 +46,7 @@ private:
     }
   };
 
-  simgrid::kernel::activity::CommImpl* get_comm(smx_simcall_t const r) const;
+  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;
   std::string get_actor_name(smx_actor_t actor) const;
@@ -74,8 +74,6 @@ public:
 
   // COMMUNICATION APIs
   RemotePtr<kernel::activity::CommImpl> get_comm_isend_raw_addr(smx_simcall_t request) const;
-  RemotePtr<kernel::activity::CommImpl> get_comm_irecv_raw_addr(smx_simcall_t request) const;
-  RemotePtr<kernel::activity::CommImpl> get_comm_wait_raw_addr(smx_simcall_t request) const;
   RemotePtr<kernel::activity::CommImpl> get_comm_waitany_raw_addr(smx_simcall_t request, int value) const;
   std::string get_pattern_comm_rdv(RemotePtr<kernel::activity::CommImpl> const& addr) const;
   unsigned long get_pattern_comm_src_proc(RemotePtr<kernel::activity::CommImpl> const& addr) const;
@@ -96,8 +94,7 @@ public:
   void mc_inc_executed_trans() const;
   unsigned long mc_get_visited_states() const;
   unsigned long mc_get_executed_trans() const;
-  bool mc_check_deadlock() const;
-  void mc_show_deadlock() const;
+  void mc_check_deadlock() const;
   bool mc_is_null() const;
   Checker* mc_get_checker() const;
   void set_checker(Checker* const checker) const;
@@ -111,7 +108,7 @@ public:
   std::list<transition_detail_t> get_enabled_transitions(simgrid::mc::State* state) const;
 
   // SIMCALL APIs
-  std::string request_to_string(smx_simcall_t req, int value, RequestType request_type) 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;
   smx_actor_t simcall_get_issuer(s_smx_simcall const* req) const;
   long simcall_get_actor_id(s_smx_simcall const* req) const;