Actor: make the refcount observable, and improve debug messages

[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 9c43bde..50112e0 100644 (file)
--- 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. */
@@ -19,7 +19,7 @@
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(instr_smpi, instr, "Tracing SMPI");
 
-static std::unordered_map<std::string, std::deque<std::string>*> keys;
+static std::unordered_map<std::string, std::deque<std::string>> keys;
 
 static std::map<std::string, std::string> smpi_colors = {{"recv", "1 0 0"},
   {"irecv", "1 0.52 0.52"},
@@ -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"},
@@ -75,11 +74,14 @@ static std::map<std::string, std::string> smpi_colors = {{"recv", "1 0 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"}
+  {"win_flush_local_all", "1 0 0.3"},
+  
+  {"file_read", "1 1 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
@@ -102,18 +104,6 @@ XBT_PRIVATE container_t smpi_container(int rank)
 
 static std::string TRACE_smpi_put_key(int src, int dst, int tag, int send)
 {
-  // get the deque for src#dst
-  std::string aux =
-      std::to_string(src) + "#" + std::to_string(dst) + "#" + std::to_string(tag) + "#" + std::to_string(send);
-  auto it = keys.find(aux);
-  std::deque<std::string>* d;
-
-  if (it == keys.end()) {
-    d         = new std::deque<std::string>;
-    keys[aux] = d;
-  } else
-    d = it->second;
-
   //generate the key
   static unsigned long long counter = 0;
   counter++;
@@ -121,7 +111,9 @@ static std::string TRACE_smpi_put_key(int src, int dst, int tag, int send)
       std::to_string(src) + "_" + std::to_string(dst) + "_" + std::to_string(tag) + "_" + std::to_string(counter);
 
   //push it
-  d->push_back(key);
+  std::string aux =
+      std::to_string(src) + "#" + std::to_string(dst) + "#" + std::to_string(tag) + "#" + std::to_string(send);
+  keys[aux].push_back(key);
 
   return key;
 }
@@ -136,45 +128,14 @@ static std::string TRACE_smpi_get_key(int src, int dst, int tag, int send)
     // first posted
     key = TRACE_smpi_put_key(src, dst, tag, send);
   } else {
-    key = it->second->front();
-    it->second->pop_front();
-    if (it->second->empty()) {
-      delete it->second;
+    key = it->second.front();
+    it->second.pop_front();
+    if (it->second.empty())
       keys.erase(it);
-    }
   }
   return key;
 }
 
-static std::unordered_map<smx_actor_t, std::string> process_category;
-
-void TRACE_internal_smpi_set_category (const char *category)
-{
-  if (not TRACE_smpi_is_enabled())
-    return;
-
-  //declare category
-  TRACE_category (category);
-
-  if (category != nullptr)
-    process_category[SIMIX_process_self()] = category;
-}
-
-const char *TRACE_internal_smpi_get_category ()
-{
-  if (not TRACE_smpi_is_enabled())
-    return nullptr;
-
-  auto it = process_category.find(SIMIX_process_self());
-  return (it == process_category.end()) ? nullptr : it->second.c_str();
-}
-
-void TRACE_smpi_release()
-{
-  for (auto const& elm : keys)
-    delete elm.second;
-}
-
 void TRACE_smpi_setup_container(int rank, sg_host_t host)
 {
   container_t father = simgrid::instr::Container::get_root();
@@ -296,25 +257,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;