-/* 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. */
#include <string>
#include <vector>
+#include "src/smpi/include/smpi_actor.hpp"
+
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"},
{"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"},
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++;
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;
}
// first posted
key = TRACE_smpi_put_key(src, dst, tag, send);
} else {
- key = it->second->front();
- it->second->pop_front();
+ 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)
+void TRACE_internal_smpi_set_category(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 nullptr;
+ return "";
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;
+ return (it == process_category.end()) ? "" : it->second.c_str();
}
void TRACE_smpi_setup_container(int rank, sg_host_t host)
}
/**************** 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;