Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
RemotePtr in get_pattern_comm_src_proc()
authoreazimi <azimi.ehsan@outlook.com>
Wed, 27 Jan 2021 13:47:37 +0000 (14:47 +0100)
committereazimi <azimi.ehsan@outlook.com>
Wed, 27 Jan 2021 13:47:37 +0000 (14:47 +0100)
src/mc/api.cpp
src/mc/api.hpp
src/mc/checker/CommunicationDeterminismChecker.cpp

index 708f537..960ade7 100644 (file)
@@ -358,10 +358,10 @@ std::string Api::get_pattern_comm_rdv(RemotePtr<kernel::activity::CommImpl> cons
   return rdv;
 }
 
-unsigned long Api::get_pattern_comm_src_proc(void* addr) const
+unsigned long Api::get_pattern_comm_src_proc(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();
   auto src_proc =
       mc_model_checker->get_remote_simulation().resolve_actor(mc::remote(synchro->src_actor_.get()))->get_pid();
index df4031e..d986868 100644 (file)
@@ -60,7 +60,7 @@ public:
   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(RemotePtr<kernel::activity::CommImpl> const& addr) const;
-  unsigned long get_pattern_comm_src_proc(void* addr) const;
+  unsigned long get_pattern_comm_src_proc(RemotePtr<kernel::activity::CommImpl> const& addr) const;
   unsigned long get_pattern_comm_dst_proc(void* addr) const;
   std::vector<char> get_pattern_comm_data(RemotePtr<kernel::activity::CommImpl> const& addr) const;
   const char* get_actor_host_name(smx_actor_t actor) const;
index 870ba4f..308bb54 100644 (file)
@@ -193,7 +193,7 @@ void CommunicationDeterminismChecker::get_comm_pattern(smx_simcall_t request, Ca
     pattern->type      = PatternCommunicationType::send;
     pattern->comm_addr = api::get().get_comm_isend_raw_addr(request).local();
     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_proc = api::get().get_pattern_comm_src_proc(remote(pattern->comm_addr));
     pattern->src_host = Api::get().get_actor_host_name(issuer);
 
 #if HAVE_SMPI