Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
no need to comm_addr_equal()
authoreazimi <azimi.ehsan@outlook.com>
Wed, 27 Jan 2021 16:58:28 +0000 (17:58 +0100)
committereazimi <azimi.ehsan@outlook.com>
Wed, 27 Jan 2021 17:32:30 +0000 (18:32 +0100)
src/mc/api.cpp
src/mc/api.hpp
src/mc/checker/CommunicationDeterminismChecker.cpp

index b0540f1..6cc5986 100644 (file)
@@ -322,12 +322,6 @@ int Api::get_actors_size() const
   return mc_model_checker->get_remote_simulation().actors().size();
 }
 
-bool Api::comm_addr_equal(const kernel::activity::CommImpl* comm_addr1,
-                             const kernel::activity::CommImpl* comm_addr2) const
-{
-  return remote(comm_addr1) == remote(comm_addr2);
-}
-
 RemotePtr<kernel::activity::CommImpl> Api::get_comm_isend_raw_addr(smx_simcall_t request) const
 {
   auto comm_addr = simgrid::simix::unmarshal_raw<simgrid::kernel::activity::ActivityImpl*>(request->result_);
index d283cf6..a58117f 100644 (file)
@@ -55,7 +55,6 @@ 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;
   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;
index 20a55e7..65422ba 100644 (file)
@@ -240,7 +240,7 @@ void CommunicationDeterminismChecker::complete_comm_pattern(RemotePtr<kernel::ac
   std::vector<PatternCommunication*>& incomplete_pattern = incomplete_communications_pattern[issuer];
   auto current_comm_pattern =
       std::find_if(begin(incomplete_pattern), end(incomplete_pattern),
-                   [&comm_addr](const PatternCommunication* comm) { return api::get().comm_addr_equal(comm->comm_addr, comm_addr.local()); });
+                   [&comm_addr](const PatternCommunication* comm) { return (remote(comm->comm_addr) == comm_addr); });
   if (current_comm_pattern == std::end(incomplete_pattern))
     xbt_die("Corresponding communication not found!");