Don't modify loop counter inside of loop body.

[simgrid.git] / src / smpi / internals / instr_smpi.cpp

diff --git a/src/smpi/internals/instr_smpi.cpp b/src/smpi/internals/instr_smpi.cpp
index 5dba5c2..3fa4aaf 100644 (file)
--- a/src/smpi/internals/instr_smpi.cpp
+++ b/src/smpi/internals/instr_smpi.cpp
@@ -90,14 +90,14 @@ static const char* instr_find_color(const char* c_state)
     return smpi_colors.find(state)->second.c_str();
   }
   for (const auto& pair : smpi_colors) { // Is an entry of our map a substring of this state name?
-    if (std::strstr(state.c_str(), pair.first.c_str()) != 0)
+    if (std::strstr(state.c_str(), pair.first.c_str()) != nullptr)
       return pair.second.c_str();
   }
 
   return "0.5 0.5 0.5"; // Just in case we find nothing in the map ...
 }
 
-XBT_PRIVATE container_t smpi_container(int rank)
+XBT_PRIVATE simgrid::instr::Container* smpi_container(int rank)
 {
   return simgrid::instr::Container::by_name(std::string("rank-") + std::to_string(rank));
 }
@@ -138,7 +138,7 @@ static std::string TRACE_smpi_get_key(int src, int dst, int tag, int send)
 
 void TRACE_smpi_setup_container(int rank, const_sg_host_t host)
 {
-  container_t father = simgrid::instr::Container::get_root();
+  auto* father = simgrid::instr::Container::get_root();
   if (TRACE_smpi_is_grouped()) {
     father = simgrid::instr::Container::by_name_or_null(host->get_name());
     xbt_assert(father != nullptr, "Could not find a parent for mpi rank 'rank-%d' at function %s", rank, __func__);
@@ -146,7 +146,7 @@ void TRACE_smpi_setup_container(int rank, const_sg_host_t host)
   father->create_child(std::string("rank-") + std::to_string(rank), "MPI"); // This container is of type MPI
 }
 
-void TRACE_smpi_init(int rank, std::string calling_func)
+void TRACE_smpi_init(int rank, const std::string& calling_func)
 {
   if (not TRACE_smpi_is_enabled())
     return;
@@ -245,7 +245,7 @@ void TRACE_smpi_process_change_host(int rank, const_sg_host_t new_host)
   counter++;
 
   // start link (= tell the trace that this rank moves from A to B)
-  container_t cont = smpi_container(rank);
+  auto* cont = smpi_container(rank);
   simgrid::instr::Container::get_root()->get_link("MIGRATE_LINK")->start_event(cont, "M", key);
 
   // Destroy container of this rank on this host