X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/58ff959662ba6ebb02d3099d43de773b955eb698..dc9b8feaddd53842f6204f4f24409b2382393fa9:/src/smpi/internals/instr_smpi.cpp

diff --git a/src/smpi/internals/instr_smpi.cpp b/src/smpi/internals/instr_smpi.cpp
index def0effed4..bcb4782ca2 100644
--- a/src/smpi/internals/instr_smpi.cpp
+++ b/src/smpi/internals/instr_smpi.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2010-2019. 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. */
@@ -36,7 +36,7 @@ static std::map<std::string, std::string> smpi_colors = {{"recv", "1 0 0"},
   {"allreduce", "1 0 1"},
   {"alltoall", "0.52 0 1"},
   {"alltoallv", "0.78 0.52 1"},
-  {"barrier", "0 0.78 0.78"},
+  {"barrier", "0 0.39 0.78"},
   {"bcast", "0 0.78 0.39"},
   {"gather", "1 1 0"},
   {"gatherv", "1 1 0.52"},
@@ -56,7 +56,6 @@ static std::map<std::string, std::string> smpi_colors = {{"recv", "1 0 0"},
   {"put", "0.3 1 0"},
   {"get", "0 1 0.3"},
   {"accumulate", "1 0.3 0"},
-  {"migration", "0.2 0.5 0.2"},
   {"rput", "0.3 1 0"},
   {"rget", "0 1 0.3"},
   {"raccumulate", "1 0.3 0"},
@@ -78,8 +77,9 @@ static std::map<std::string, std::string> smpi_colors = {{"recv", "1 0 0"},
   {"win_flush_local_all", "1 0 0.3"}
 };
 
-static const char* instr_find_color(std::string state)
+static const char* instr_find_color(const char* c_state)
 {
+  std::string state(c_state);
   boost::algorithm::to_lower(state);
   if (state.substr(0, 5) == "pmpi_")
     state = state.substr(5, std::string::npos); // Remove pmpi_ to allow for exact matches
@@ -136,19 +136,19 @@ static std::string TRACE_smpi_get_key(int src, int dst, int tag, int send)
 
 static std::unordered_map<smx_actor_t, std::string> process_category;
 
-void TRACE_internal_smpi_set_category (const char *category)
+void TRACE_internal_smpi_set_category(const std::string& category)
 {
   if (not TRACE_smpi_is_enabled())
     return;
 
   //declare category
-  TRACE_category (category);
+  TRACE_category(category.c_str());
 
-  if (category != nullptr)
+  if (not category.empty())
     process_category[SIMIX_process_self()] = category;
 }
 
-const char *TRACE_internal_smpi_get_category ()
+std::string TRACE_internal_smpi_get_category()
 {
   if (not TRACE_smpi_is_enabled())
     return "";
@@ -278,25 +278,9 @@ void TRACE_smpi_recv(int src, int dst, int tag)
 }
 
 /**************** Functions to trace the migration of tasks. *****************/
-void TRACE_smpi_send_process_data_in(int rank)
-{
-  if (not TRACE_smpi_is_enabled()) return;
-
-  smpi_container(rank)->get_state("MIGRATE_STATE")->add_entity_value("migration", instr_find_color("migration"));
-  smpi_container(rank)->get_state("MIGRATE_STATE")->push_event("migration");
-}
-
-void TRACE_smpi_send_process_data_out(int rank)
-{
-  if (not TRACE_smpi_is_enabled()) return; 
-
-  /* Clean the process state. */
-  smpi_container(rank)->get_state("MIGRATE_STATE")->pop_event();
-}
-
 void TRACE_smpi_process_change_host(int rank, sg_host_t new_host)
 {
-  if (!TRACE_smpi_is_enabled()) return;
+  if (not TRACE_smpi_is_enabled()) return;
 
   /** The key is (most likely) used to match the events in the trace */
   static long long int counter = 0;