-/* 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. */
if (not netzone->get_children().empty()) {
// bottom-up recursion
for (auto const& nz_son : netzone->get_children()) {
- container_t child_container = container->children_.at(nz_son->get_cname());
+ container_t child_container = container->children_.at(nz_son->get_name());
recursiveGraphExtraction(nz_son, child_container, filter);
}
}
std::string id = netzone.get_name();
if (simgrid::instr::Container::get_root() == nullptr) {
simgrid::instr::NetZoneContainer* root = new simgrid::instr::NetZoneContainer(id, 0, nullptr);
+ xbt_assert(simgrid::instr::Container::get_root() == root);
if (TRACE_smpi_is_enabled()) {
simgrid::instr::ContainerType* mpi = root->type_->by_name_or_create<simgrid::instr::ContainerType>("MPI");
static void instr_host_on_speed_change(simgrid::s4u::Host& host)
{
- simgrid::instr::Container::by_name(host.get_cname())
+ simgrid::instr::Container::by_name(host.get_name())
->get_variable("speed")
->set_event(surf_get_clock(), host.get_core_count() * host.get_available_speed());
}
static void instr_link_on_bandwidth_change(simgrid::s4u::Link& link)
{
- simgrid::instr::Container::by_name(link.get_cname())
+ simgrid::instr::Container::by_name(link.get_name())
->get_variable("bandwidth")
->set_event(surf_get_clock(), sg_bandwidth_factor * link.get_bandwidth());
}
static void instr_netpoint_on_creation(simgrid::kernel::routing::NetPoint* netpoint)
{
if (netpoint->is_router())
- new simgrid::instr::RouterContainer(netpoint->get_cname(), currentContainer.back());
+ new simgrid::instr::RouterContainer(netpoint->get_name(), currentContainer.back());
}
static void instr_on_platform_created()
std::string container_name = instr_pid(actor.get());
actor->on_exit(
- [container_name](int status, void* actor) {
+ [container_name](int status, void*) {
if (status == SMX_EXIT_FAILURE)
// kill means that this actor no longer exists, let's destroy it
simgrid::instr::Container::by_name(container_name)->remove_from_parent();
/*
* user categories support
*/
-static void recursiveNewVariableType(std::string new_typename, std::string color, simgrid::instr::Type* root)
+static void recursiveNewVariableType(const std::string& new_typename, const std::string& color,
+ simgrid::instr::Type* root)
{
if (root->get_name() == "HOST" || root->get_name() == "VM")
root->by_name_or_create(std::string("p") + new_typename, color);
}
}
-void instr_new_variable_type(std::string new_typename, std::string color)
+void instr_new_variable_type(const std::string& new_typename, const std::string& color)
{
recursiveNewVariableType(new_typename, color, simgrid::instr::Container::get_root()->type_);
}
-static void recursiveNewUserVariableType(std::string father_type, std::string new_typename, std::string color,
- simgrid::instr::Type* root)
+static void recursiveNewUserVariableType(const std::string& father_type, const std::string& new_typename,
+ const std::string& color, simgrid::instr::Type* root)
{
if (root->get_name() == father_type) {
root->by_name_or_create(new_typename, color);
recursiveNewUserVariableType(father_type, new_typename, color, elm.second);
}
-void instr_new_user_variable_type(std::string father_type, std::string new_typename, std::string color)
+void instr_new_user_variable_type(const std::string& father_type, const std::string& new_typename,
+ const std::string& color)
{
recursiveNewUserVariableType(father_type, new_typename, color, simgrid::instr::Container::get_root()->type_);
}
-static void recursiveNewUserStateType(std::string father_type, std::string new_typename, simgrid::instr::Type* root)
+static void recursiveNewUserStateType(const std::string& father_type, const std::string& new_typename,
+ simgrid::instr::Type* root)
{
if (root->get_name() == father_type)
root->by_name_or_create<simgrid::instr::StateType>(new_typename);
recursiveNewUserStateType(father_type, new_typename, elm.second);
}
-void instr_new_user_state_type(std::string father_type, std::string new_typename)
+void instr_new_user_state_type(const std::string& father_type, const std::string& new_typename)
{
recursiveNewUserStateType(father_type, new_typename, simgrid::instr::Container::get_root()->type_);
}
-static void recursiveNewValueForUserStateType(std::string type_name, const char* val, std::string color,
+static void recursiveNewValueForUserStateType(const std::string& type_name, const char* val, const std::string& color,
simgrid::instr::Type* root)
{
if (root->get_name() == type_name)
recursiveNewValueForUserStateType(type_name, val, color, elm.second);
}
-void instr_new_value_for_user_state_type(std::string type_name, const char* value, std::string color)
+void instr_new_value_for_user_state_type(const std::string& type_name, const char* value, const std::string& color)
{
recursiveNewValueForUserStateType(type_name, value, color, simgrid::instr::Container::get_root()->type_);
}
if (not netzone->get_children().empty()) {
// bottom-up recursion
for (auto const& netzone_child : netzone->get_children()) {
- container_t child_container = container->children_.at(netzone_child->get_cname());
+ container_t child_container = container->children_.at(netzone_child->get_name());
recursiveXBTGraphExtraction(graph, nodes, edges, netzone_child, child_container);
}
}