Const pointer.

[simgrid.git] / src / mc / checker / CommunicationDeterminismChecker.cpp

diff --git a/src/mc/checker/CommunicationDeterminismChecker.cpp b/src/mc/checker/CommunicationDeterminismChecker.cpp
index c959f92..ac2f3f4 100644 (file)
--- a/src/mc/checker/CommunicationDeterminismChecker.cpp
+++ b/src/mc/checker/CommunicationDeterminismChecker.cpp
@@ -30,24 +30,6 @@ std::vector<std::vector<simgrid::mc::PatternCommunication*>> incomplete_communic
 
 /********** Static functions ***********/
 
-void copy_incomplete_comm_pattern(simgrid::mc::State* state)
-{
-  state->incomplete_comm_pattern_.clear();
-  for (unsigned i=0; i < MC_smx_get_maxpid(); i++) {
-    std::vector<simgrid::mc::PatternCommunication> res;
-    for (auto const& comm : incomplete_communications_pattern[i])
-      res.push_back(comm->dup());
-    state->incomplete_comm_pattern_.push_back(std::move(res));
-  }
-}
-
-void copy_index_comm_pattern(simgrid::mc::State* state)
-{
-  state->communication_indices_.clear();
-  for (auto const& list_process_comm : initial_communications_pattern)
-    state->communication_indices_.push_back(list_process_comm.index_comm);
-}
-
 static simgrid::mc::CommPatternDifference compare_comm_pattern(const simgrid::mc::PatternCommunication* comm1,
                                                                const simgrid::mc::PatternCommunication* comm2)
 {
@@ -79,12 +61,12 @@ static void patterns_copy(std::vector<simgrid::mc::PatternCommunication*>& dest,
   }
 }
 
-void restore_communications_pattern(simgrid::mc::State* state)
+static void restore_communications_pattern(simgrid::mc::State* state)
 {
-  for (unsigned i = 0; i < initial_communications_pattern.size(); i++)
+  for (size_t i = 0; i < initial_communications_pattern.size(); i++)
     initial_communications_pattern[i].index_comm = state->communication_indices_[i];
 
-  for (unsigned i = 0; i < mcapi::get().get_maxpid(); i++)
+  for (unsigned long i = 0; i < mcapi::get().get_maxpid(); i++)
     patterns_copy(incomplete_communications_pattern[i], state->incomplete_comm_pattern_[i]);
 }
 
@@ -140,14 +122,8 @@ static void update_comm_pattern(simgrid::mc::PatternCommunication* comm_pattern,
   comm_pattern->src_host = mcapi::get().get_actor_host_name(src_proc);
   comm_pattern->dst_host = mcapi::get().get_actor_host_name(dst_proc);
 
-  if (comm_pattern->data.empty()) {
-    auto pattern_data = mcapi::get().get_pattern_comm_data(comm_addr);
-    if (pattern_data.data() != nullptr) {
-      auto data_size = pattern_data.size();
-      comm_pattern->data.resize(data_size);
-      memcpy(comm_pattern->data.data(), pattern_data.data(), data_size);
-    }
-   }
+  if (comm_pattern->data.empty())
+    comm_pattern->data = mcapi::get().get_pattern_comm_data(comm_addr);
 }
 
 namespace simgrid {
@@ -224,12 +200,7 @@ void CommunicationDeterminismChecker::get_comm_pattern(smx_simcall_t request, Ca
 #if HAVE_SMPI
     pattern->tag = mcapi::get().get_smpi_request_tag(request, simgrid::simix::Simcall::COMM_ISEND);
 #endif
-    auto pattern_data = mcapi::get().get_pattern_comm_data(pattern->comm_addr);
-    if (pattern_data.data() != nullptr) {
-      auto data_size = pattern_data.size();
-      pattern->data.resize(data_size);
-      memcpy(pattern->data.data(), pattern_data.data(), data_size);
-    }
+    pattern->data = mcapi::get().get_pattern_comm_data(pattern->comm_addr);
 
 #if HAVE_SMPI
     auto send_detached = mcapi::get().check_send_request_detached(request);
@@ -338,7 +309,7 @@ void CommunicationDeterminismChecker::log_state() // override
 
 void CommunicationDeterminismChecker::prepare()
 {
-  const int maxpid = mcapi::get().get_maxpid();
+  const auto maxpid = mcapi::get().get_maxpid();
 
   initial_communications_pattern.resize(maxpid);
   incomplete_communications_pattern.resize(maxpid);
@@ -382,10 +353,10 @@ void CommunicationDeterminismChecker::restoreState()
   /* Restore the initial state */
   mcapi::get().restore_initial_state();
 
-  unsigned n = mcapi::get().get_maxpid();
+  unsigned long n = mcapi::get().get_maxpid();
   assert(n == incomplete_communications_pattern.size());
   assert(n == initial_communications_pattern.size());
-  for (unsigned j = 0; j < n; j++) {
+  for (unsigned long j = 0; j < n; j++) {
     incomplete_communications_pattern[j].clear();
     initial_communications_pattern[j].index_comm = 0;
   }
@@ -429,7 +400,7 @@ void CommunicationDeterminismChecker::handle_comm_pattern(simgrid::mc::CallType
       break;
     case CallType::WAIT:
     case CallType::WAITANY: {
-      simgrid::kernel::activity::CommImpl* comm_addr = nullptr;
+      const simgrid::kernel::activity::CommImpl* comm_addr = nullptr;
       if (call_type == CallType::WAIT)
         comm_addr = mcapi::get().get_comm_wait_raw_addr(req);
       else