RemotePtr as the input parameter type in get_pattern_comm_rdv()

diff --git a/src/mc/api.cpp b/src/mc/api.cpp
index 22125a6..c164baa 100644 (file)
--- a/src/mc/api.cpp
+++ b/src/mc/api.cpp
@@ -346,10 +346,10 @@ kernel::activity::CommImpl* Api::get_comm_waitany_raw_addr(smx_simcall_t request
   return static_cast<simgrid::kernel::activity::CommImpl*>(addr);
 }
 
-std::string Api::get_pattern_comm_rdv(void* addr) const
+std::string Api::get_pattern_comm_rdv(RemotePtr<kernel::activity::CommImpl> const& addr) const
 {
   Remote<kernel::activity::CommImpl> temp_synchro;
-  mc_model_checker->get_remote_simulation().read(temp_synchro, remote((simgrid::kernel::activity::CommImpl*)addr));
+  mc_model_checker->get_remote_simulation().read(temp_synchro, remote(addr.local()));
   const kernel::activity::CommImpl* synchro = temp_synchro.get_buffer();
 
   char* remote_name = mc_model_checker->get_remote_simulation().read<char*>(RemotePtr<char*>(

diff --git a/src/mc/api.hpp b/src/mc/api.hpp
index bb672ea..0a3e117 100644 (file)
--- a/src/mc/api.hpp
+++ b/src/mc/api.hpp
@@ -59,7 +59,7 @@ public:
   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;
-  std::string get_pattern_comm_rdv(void* addr) const;
+  std::string get_pattern_comm_rdv(RemotePtr<kernel::activity::CommImpl> const& 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;

diff --git a/src/mc/checker/CommunicationDeterminismChecker.cpp b/src/mc/checker/CommunicationDeterminismChecker.cpp
index 979950c..678544e 100644 (file)
--- a/src/mc/checker/CommunicationDeterminismChecker.cpp
+++ b/src/mc/checker/CommunicationDeterminismChecker.cpp
@@ -191,7 +191,7 @@ void CommunicationDeterminismChecker::get_comm_pattern(smx_simcall_t request, Ca
     /* Create comm pattern */
     pattern->type      = PatternCommunicationType::send;
     pattern->comm_addr = api::get().get_comm_isend_raw_addr(request).local();
-    pattern->rdv      = api::get().get_pattern_comm_rdv(pattern->comm_addr);
+    pattern->rdv      = api::get().get_pattern_comm_rdv(remote(pattern->comm_addr));
     pattern->src_proc = api::get().get_pattern_comm_src_proc(pattern->comm_addr);
     pattern->src_host = Api::get().get_actor_host_name(issuer);
 
@@ -222,7 +222,7 @@ void CommunicationDeterminismChecker::get_comm_pattern(smx_simcall_t request, Ca
     pattern->tag = api::get().get_smpi_request_tag(request, simgrid::simix::Simcall::COMM_IRECV);
 #endif
     auto comm_addr = pattern->comm_addr;
-    pattern->rdv = api::get().get_pattern_comm_rdv(comm_addr);
+    pattern->rdv = api::get().get_pattern_comm_rdv(remote(comm_addr));
     pattern->dst_proc = api::get().get_pattern_comm_dst_proc(comm_addr);
     pattern->dst_host = api::get().get_actor_host_name(issuer);
   } else