Make global variables 'const'.

diff --git a/src/smpi/internals/instr_smpi.cpp b/src/smpi/internals/instr_smpi.cpp
index e25ce24..49c6ca3 100644 (file)
--- a/src/smpi/internals/instr_smpi.cpp
+++ b/src/smpi/internals/instr_smpi.cpp
@@ -21,62 +21,62 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(instr_smpi, instr, "Tracing SMPI");
 
 static std::unordered_map<std::string, std::deque<std::string>> keys;
 
-static std::map<std::string, std::string, std::less<>> smpi_colors = {{"recv", "1 0 0"},
-                                                                      {"irecv", "1 0.52 0.52"},
-                                                                      {"send", "0 0 1"},
-                                                                      {"isend", "0.52 0.52 1"},
-                                                                      {"sendrecv", "0 1 1"},
-                                                                      {"wait", "1 1 0"},
-                                                                      {"waitall", "0.78 0.78 0"},
-                                                                      {"waitany", "0.78 0.78 0.58"},
-                                                                      {"test", "0.52 0.52 0"},
-
-                                                                      {"allgather", "1 0 0"},
-                                                                      {"allgatherv", "1 0.52 0.52"},
-                                                                      {"allreduce", "1 0 1"},
-                                                                      {"alltoall", "0.52 0 1"},
-                                                                      {"alltoallv", "0.78 0.52 1"},
-                                                                      {"barrier", "0 0.39 0.78"},
-                                                                      {"bcast", "0 0.78 0.39"},
-                                                                      {"gather", "1 1 0"},
-                                                                      {"gatherv", "1 1 0.52"},
-                                                                      {"reduce", "0 1 0"},
-                                                                      {"reducescatter", "0.52 1 0.52"},
-                                                                      {"scan", "1 0.58 0.23"},
-                                                                      {"exscan", "1 0.54 0.25"},
-                                                                      {"scatterv", "0.52 0 0.52"},
-                                                                      {"scatter", "1 0.74 0.54"},
-
-                                                                      {"computing", "0 1 1"},
-                                                                      {"sleeping", "0 0.5 0.5"},
-
-                                                                      {"init", "0 1 0"},
-                                                                      {"finalize", "0 1 0"},
-
-                                                                      {"put", "0.3 1 0"},
-                                                                      {"get", "0 1 0.3"},
-                                                                      {"accumulate", "1 0.3 0"},
-                                                                      {"rput", "0.3 1 0"},
-                                                                      {"rget", "0 1 0.3"},
-                                                                      {"raccumulate", "1 0.3 0"},
-                                                                      {"compare_and_swap", "0.3 1 0"},
-                                                                      {"get_accumulate", "0 1 0.3"},
-                                                                      {"rget_accumulate", "1 0.3 0"},
-                                                                      {"win_fence", "1 0 0.3"},
-                                                                      {"win_post", "1 0 0.8"},
-                                                                      {"win_wait", "1 0.8 0"},
-                                                                      {"win_start", "0.8 0 1"},
-                                                                      {"win_complete", "0.8 1 0"},
-                                                                      {"win_lock", "1 0 0.3"},
-                                                                      {"win_unlock", "1 0 0.3"},
-                                                                      {"win_lock_all", "1 0 0.8"},
-                                                                      {"win_unlock_all", "1 0.8 0"},
-                                                                      {"win_flush", "1 0 0.3"},
-                                                                      {"win_flush_local", "1 0 0.8"},
-                                                                      {"win_flush_all", "1 0.8 0"},
-                                                                      {"win_flush_local_all", "1 0 0.3"},
-
-                                                                      {"file_read", "1 1 0.3"}};
+static const std::map<std::string, std::string, std::less<>> smpi_colors = {{"recv", "1 0 0"},
+                                                                            {"irecv", "1 0.52 0.52"},
+                                                                            {"send", "0 0 1"},
+                                                                            {"isend", "0.52 0.52 1"},
+                                                                            {"sendrecv", "0 1 1"},
+                                                                            {"wait", "1 1 0"},
+                                                                            {"waitall", "0.78 0.78 0"},
+                                                                            {"waitany", "0.78 0.78 0.58"},
+                                                                            {"test", "0.52 0.52 0"},
+
+                                                                            {"allgather", "1 0 0"},
+                                                                            {"allgatherv", "1 0.52 0.52"},
+                                                                            {"allreduce", "1 0 1"},
+                                                                            {"alltoall", "0.52 0 1"},
+                                                                            {"alltoallv", "0.78 0.52 1"},
+                                                                            {"barrier", "0 0.39 0.78"},
+                                                                            {"bcast", "0 0.78 0.39"},
+                                                                            {"gather", "1 1 0"},
+                                                                            {"gatherv", "1 1 0.52"},
+                                                                            {"reduce", "0 1 0"},
+                                                                            {"reducescatter", "0.52 1 0.52"},
+                                                                            {"scan", "1 0.58 0.23"},
+                                                                            {"exscan", "1 0.54 0.25"},
+                                                                            {"scatterv", "0.52 0 0.52"},
+                                                                            {"scatter", "1 0.74 0.54"},
+
+                                                                            {"computing", "0 1 1"},
+                                                                            {"sleeping", "0 0.5 0.5"},
+
+                                                                            {"init", "0 1 0"},
+                                                                            {"finalize", "0 1 0"},
+
+                                                                            {"put", "0.3 1 0"},
+                                                                            {"get", "0 1 0.3"},
+                                                                            {"accumulate", "1 0.3 0"},
+                                                                            {"rput", "0.3 1 0"},
+                                                                            {"rget", "0 1 0.3"},
+                                                                            {"raccumulate", "1 0.3 0"},
+                                                                            {"compare_and_swap", "0.3 1 0"},
+                                                                            {"get_accumulate", "0 1 0.3"},
+                                                                            {"rget_accumulate", "1 0.3 0"},
+                                                                            {"win_fence", "1 0 0.3"},
+                                                                            {"win_post", "1 0 0.8"},
+                                                                            {"win_wait", "1 0.8 0"},
+                                                                            {"win_start", "0.8 0 1"},
+                                                                            {"win_complete", "0.8 1 0"},
+                                                                            {"win_lock", "1 0 0.3"},
+                                                                            {"win_unlock", "1 0 0.3"},
+                                                                            {"win_lock_all", "1 0 0.8"},
+                                                                            {"win_unlock_all", "1 0.8 0"},
+                                                                            {"win_flush", "1 0 0.3"},
+                                                                            {"win_flush_local", "1 0 0.8"},
+                                                                            {"win_flush_all", "1 0.8 0"},
+                                                                            {"win_flush_local_all", "1 0 0.3"},
+
+                                                                            {"file_read", "1 1 0.3"}};
 
 static const char* instr_find_color(const char* c_state)
 {

diff --git a/src/smpi/plugins/ampi/instr_ampi.cpp b/src/smpi/plugins/ampi/instr_ampi.cpp
index 851f2ee..4015ef4 100644 (file)
--- a/src/smpi/plugins/ampi/instr_ampi.cpp
+++ b/src/smpi/plugins/ampi/instr_ampi.cpp
@@ -9,8 +9,8 @@
 #include <src/instr/instr_smpi.hpp>
 #include <src/smpi/include/smpi_actor.hpp>
 
-static std::map<std::string, std::string, std::less<>> 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)
 {
@@ -18,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);
 }
 
@@ -49,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();
   }