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

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

diff --git a/src/mc/api.hpp b/src/mc/api.hpp
index e6c38a0ac43aef4b7885c833e69bc2663625ee95..056e4947774ecc3f94fccf4359c5b302a7767c20 100644 (file)
--- a/src/mc/api.hpp
+++ b/src/mc/api.hpp
@@ -34,6 +34,9 @@ private:
     }
   };
 
+smx_mailbox_t get_mbox(smx_simcall_t const r) const;
+simgrid::kernel::activity::CommImpl* get_comm(smx_simcall_t const r) const;
+bool request_depend_asymmetric(smx_simcall_t r1, smx_simcall_t r2) const;
 
 public:
   // No copy:
@@ -55,10 +58,10 @@ public:
   int get_actors_size() const;
 
   // COMMUNICATION APIs
-  bool comm_addr_equal(const kernel::activity::CommImpl* comm_addr1, const kernel::activity::CommImpl* comm_addr2) const;
   RemotePtr<kernel::activity::CommImpl> get_comm_isend_raw_addr(smx_simcall_t request) const;
-  kernel::activity::CommImpl* get_comm_wait_raw_addr(smx_simcall_t request) const;
-  kernel::activity::CommImpl* get_comm_waitany_raw_addr(smx_simcall_t request, int value) 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;
   unsigned long get_pattern_comm_dst_proc(RemotePtr<kernel::activity::CommImpl> const& addr) const;
@@ -67,8 +70,8 @@ public:
 #if HAVE_SMPI
   bool check_send_request_detached(smx_simcall_t const& simcall) const;
 #endif
-  smx_actor_t get_src_actor(const kernel::activity::CommImpl* comm_addr) const;
-  smx_actor_t get_dst_actor(const kernel::activity::CommImpl* comm_addr) const;
+  smx_actor_t get_src_actor(RemotePtr<kernel::activity::CommImpl> const& comm_addr) const;
+  smx_actor_t get_dst_actor(RemotePtr<kernel::activity::CommImpl> const& comm_addr) const;
 
   // REMOTE APIs
   std::size_t get_remote_heap_bytes() const;