X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/84402e8e2ee2a2d0bef25fdceb0a263ed8b471f6..95ba94e9e13db930fca1286531b53ec70b1392bb:/src/smpi/plugins/ampi/instr_ampi.cpp

diff --git a/src/smpi/plugins/ampi/instr_ampi.cpp b/src/smpi/plugins/ampi/instr_ampi.cpp
index 4245c78c56..4015ef48dc 100644
--- a/src/smpi/plugins/ampi/instr_ampi.cpp
+++ b/src/smpi/plugins/ampi/instr_ampi.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010-2020. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2010-2021. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -9,9 +9,8 @@
 #include <src/instr/instr_smpi.hpp>
 #include <src/smpi/include/smpi_actor.hpp>
 
-static std::map<std::string, std::string> ampi_colors = {{"migrate", "0.2 0.5 0.2"},
-  {"iteration", "0.5 0.5 0.5"}
-};
+static const std::map<std::string, std::string, std::less<>> ampi_colors = {{"migrate", "0.2 0.5 0.2"},
+                                                                            {"iteration", "0.5 0.5 0.5"}};
 
 void TRACE_Iteration_in(int rank, simgrid::instr::TIData* extra)
 {
@@ -19,7 +18,7 @@ void TRACE_Iteration_in(int rank, simgrid::instr::TIData* extra)
     delete extra;
     return;
   }
-  smpi_container(rank)->get_state("MPI_STATE")->add_entity_value("iteration", ampi_colors["iteration"]);
+  smpi_container(rank)->get_state("MPI_STATE")->add_entity_value("iteration", ampi_colors.at("iteration"));
   smpi_container(rank)->get_state("MPI_STATE")->push_event("iteration", extra);
 }
 
@@ -38,8 +37,7 @@ void TRACE_migration_call(int rank, simgrid::instr::TIData* extra)
   if(smpi_process()->replaying()) {//When replaying, we register an event.
     smpi_container(rank)->get_state("MIGRATE_STATE")->add_entity_value(operation);
 
-    simgrid::instr::EventType* type =
-      static_cast<simgrid::instr::EventType*>(smpi_container(rank)->type_->by_name(operation));
+    auto* type = static_cast<simgrid::instr::EventType*>(smpi_container(rank)->type_->by_name(operation));
     new simgrid::instr::NewEvent(smpi_process()->simulated_elapsed(), smpi_container(rank), type,
                                  type->get_entity_value(operation));
   } else {
@@ -51,7 +49,7 @@ void TRACE_migration_call(int rank, simgrid::instr::TIData* extra)
       delete extra;
       return;
     }
-    smpi_container(rank)->get_state("MIGRATE_STATE")->add_entity_value(operation, ampi_colors[operation.c_str()]);
+    smpi_container(rank)->get_state("MIGRATE_STATE")->add_entity_value(operation, ampi_colors.at(operation));
     smpi_container(rank)->get_state("MIGRATE_STATE")->push_event(operation, extra);
     smpi_container(rank)->get_state("MIGRATE_STATE")->pop_event();
   }