X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4dfea8bcd57b5ad5c7f03aaba36e65e406bbe670..6db44d40a0cb94c4ad8fac6861e349057bf932e7:/src/mc/checker/CommunicationDeterminismChecker.cpp

diff --git a/src/mc/checker/CommunicationDeterminismChecker.cpp b/src/mc/checker/CommunicationDeterminismChecker.cpp
index e4f7e93f99..e64020db30 100644
--- a/src/mc/checker/CommunicationDeterminismChecker.cpp
+++ b/src/mc/checker/CommunicationDeterminismChecker.cpp
@@ -63,10 +63,10 @@ static void patterns_copy(std::vector<simgrid::mc::PatternCommunication*>& dest,
 
 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]);
 }
 
@@ -122,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 {
@@ -206,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);
@@ -320,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);
@@ -364,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;
   }
@@ -548,7 +537,7 @@ void CommunicationDeterminismChecker::real_run()
 void CommunicationDeterminismChecker::run()
 {
   XBT_INFO("Check communication determinism");
-  mcapi::get().s_initialize();
+  mcapi::get().session_initialize();
 
   this->prepare();
   this->real_run();