X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/581fd733dd72630f9aa9b7528503693bd857bbbd..c8b5e57d630bb3e7247783bdff1820cc4e2f67ff:/src/instr/instr_platform.cpp diff --git a/src/instr/instr_platform.cpp b/src/instr/instr_platform.cpp index a2adf5e3c6..b3c60e79f1 100644 --- a/src/instr/instr_platform.cpp +++ b/src/instr/instr_platform.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2010-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2010-2020. 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. */ @@ -8,7 +8,9 @@ #include "simgrid/kernel/routing/NetPoint.hpp" #include "simgrid/kernel/routing/NetZoneImpl.hpp" #include "simgrid/s4u/Actor.hpp" +#include "simgrid/s4u/Comm.hpp" #include "simgrid/s4u/Engine.hpp" +#include "simgrid/s4u/Exec.hpp" #include "simgrid/s4u/Host.hpp" #include "simgrid/s4u/VirtualMachine.hpp" #include "src/surf/cpu_interface.hpp" @@ -20,14 +22,17 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(instr_routing, instr, "Tracing platform hierarchy"); -static std::vector currentContainer; /* push and pop, used only in creation */ +std::string instr_pid(simgrid::s4u::Actor const& proc) +{ + return std::string(proc.get_name()) + "-" + std::to_string(proc.get_pid()); +} -static const char* instr_node_name(xbt_node_t node) +static const char* instr_node_name(const s_xbt_node_t* node) { return static_cast(xbt_graph_node_get_data(node)); } -static container_t lowestCommonAncestor(container_t a1, container_t a2) +static container_t lowestCommonAncestor(const simgrid::instr::Container* a1, const simgrid::instr::Container* a2) { // this is only an optimization (since most of a1 and a2 share the same parent) if (a1->father_ == a2->father_) @@ -55,7 +60,7 @@ static container_t lowestCommonAncestor(container_t a1, container_t a2) int j = ancestors_a2.size() - 1; while (i >= 0 && j >= 0) { container_t a1p = ancestors_a1.at(i); - container_t a2p = ancestors_a2.at(j); + const simgrid::instr::Container* a2p = ancestors_a2.at(j); if (a1p == a2p) { p = a1p; } else { @@ -104,9 +109,6 @@ static void linkContainers(container_t src, container_t dst, std::settype_->by_name_or_create(link_typename, src->type_, dst->type_); link->set_calling_container(father); - // register EDGE types for triva configuration - trivaEdgeTypes.insert(link->get_name()); - // create the link static long long counter = 0; @@ -119,7 +121,7 @@ static void linkContainers(container_t src, container_t dst, std::set %s", src->get_cname(), dst->get_cname()); } -static void recursiveGraphExtraction(simgrid::s4u::NetZone* netzone, container_t container, +static void recursiveGraphExtraction(const simgrid::s4u::NetZone* netzone, container_t container, std::set* filter) { if (not TRACE_platform_topology()) { @@ -127,21 +129,21 @@ static void recursiveGraphExtraction(simgrid::s4u::NetZone* netzone, container_t return; } XBT_DEBUG("Graph extraction for NetZone = %s", netzone->get_cname()); - if (not netzone->getChildren()->empty()) { + if (not netzone->get_children().empty()) { // bottom-up recursion - for (auto const& nz_son : *netzone->getChildren()) { - container_t child_container = container->children_.at(nz_son->get_cname()); + for (auto const& nz_son : netzone->get_children()) { + container_t child_container = container->children_.at(nz_son->get_name()); recursiveGraphExtraction(nz_son, child_container, filter); } } xbt_graph_t graph = xbt_graph_new_graph(0, nullptr); - std::map* nodes = new std::map; - std::map* edges = new std::map; + std::map* nodes = new std::map(); + std::map* edges = new std::map(); - static_cast(netzone)->get_graph(graph, nodes, edges); + netzone->get_impl()->get_graph(graph, nodes, edges); for (auto elm : *edges) { - xbt_edge_t edge = elm.second; + const xbt_edge* edge = elm.second; linkContainers(simgrid::instr::Container::by_name(static_cast(edge->src->data)), simgrid::instr::Container::by_name(static_cast(edge->dst->data)), filter); } @@ -153,20 +155,26 @@ static void recursiveGraphExtraction(simgrid::s4u::NetZone* netzone, container_t /* * Callbacks */ -static void instr_netzone_on_creation(simgrid::s4u::NetZone& netzone) + +namespace simgrid { +namespace instr { + +static std::vector currentContainer; /* push and pop, used only in creation */ +static void on_netzone_creation(s4u::NetZone const& netzone) { std::string id = netzone.get_name(); - if (simgrid::instr::Container::get_root() == nullptr) { - simgrid::instr::NetZoneContainer* root = new simgrid::instr::NetZoneContainer(id, 0, nullptr); + if (Container::get_root() == nullptr) { + NetZoneContainer* root = new NetZoneContainer(id, 0, nullptr); + xbt_assert(Container::get_root() == root); if (TRACE_smpi_is_enabled()) { - simgrid::instr::ContainerType* mpi = root->type_->by_name_or_create("MPI"); + ContainerType* mpi = root->type_->by_name_or_create("MPI"); if (not TRACE_smpi_is_grouped()) - mpi->by_name_or_create("MPI_STATE"); + mpi->by_name_or_create("MPI_STATE"); root->type_->by_name_or_create("MPI_LINK", mpi, mpi); // TODO See if we can move this to the LoadBalancer plugin root->type_->by_name_or_create("MIGRATE_LINK", mpi, mpi); - mpi->by_name_or_create("MIGRATE_STATE"); + mpi->by_name_or_create("MIGRATE_STATE"); } if (TRACE_needs_platform()) { @@ -176,24 +184,23 @@ static void instr_netzone_on_creation(simgrid::s4u::NetZone& netzone) } if (TRACE_needs_platform()) { - simgrid::instr::NetZoneContainer* container = - new simgrid::instr::NetZoneContainer(id, currentContainer.size(), currentContainer.back()); + NetZoneContainer* container = new NetZoneContainer(id, currentContainer.size(), currentContainer.back()); currentContainer.push_back(container); } } -static void instr_link_on_creation(simgrid::s4u::Link& link) +static void on_link_creation(s4u::Link const& link) { if (currentContainer.empty()) // No ongoing parsing. Are you creating the loopback? return; - container_t container = new simgrid::instr::Container(link.get_name(), "LINK", currentContainer.back()); + Container* container = new Container(link.get_name(), "LINK", currentContainer.back()); if ((TRACE_categorized() || TRACE_uncategorized() || TRACE_platform()) && (not TRACE_disable_link())) { - simgrid::instr::VariableType* bandwidth = container->type_->by_name_or_create("bandwidth", ""); + VariableType* bandwidth = container->type_->by_name_or_create("bandwidth", ""); bandwidth->set_calling_container(container); bandwidth->set_event(0, link.get_bandwidth()); - simgrid::instr::VariableType* latency = container->type_->by_name_or_create("latency", ""); + VariableType* latency = container->type_->by_name_or_create("latency", ""); latency->set_calling_container(container); latency->set_event(0, link.get_latency()); } @@ -202,204 +209,220 @@ static void instr_link_on_creation(simgrid::s4u::Link& link) } } -static void instr_host_on_creation(simgrid::s4u::Host& host) +static void on_host_creation(s4u::Host const& host) { - container_t container = new simgrid::instr::HostContainer(host, currentContainer.back()); - container_t root = simgrid::instr::Container::get_root(); + Container* container = new HostContainer(host, currentContainer.back()); + const Container* root = Container::get_root(); if ((TRACE_categorized() || TRACE_uncategorized() || TRACE_platform()) && (not TRACE_disable_speed())) { - simgrid::instr::VariableType* power = container->type_->by_name_or_create("power", ""); - power->set_calling_container(container); - power->set_event(0, host.getSpeed()); + VariableType* speed = container->type_->by_name_or_create("speed", ""); + speed->set_calling_container(container); + speed->set_event(0, host.get_speed()); + + VariableType* cores = container->type_->by_name_or_create("core_count", ""); + cores->set_calling_container(container); + cores->set_event(0, host.get_core_count()); } if (TRACE_uncategorized()) - container->type_->by_name_or_create("power_used", "0.5 0.5 0.5"); + container->type_->by_name_or_create("speed_used", "0.5 0.5 0.5"); if (TRACE_smpi_is_enabled() && TRACE_smpi_is_grouped()) { - simgrid::instr::ContainerType* mpi = container->type_->by_name_or_create("MPI"); - mpi->by_name_or_create("MPI_STATE"); + ContainerType* mpi = container->type_->by_name_or_create("MPI"); + mpi->by_name_or_create("MPI_STATE"); // TODO See if we can move this to the LoadBalancer plugin root->type_->by_name_or_create("MIGRATE_LINK", mpi, mpi); - mpi->by_name_or_create("MIGRATE_STATE"); + mpi->by_name_or_create("MIGRATE_STATE"); } } -static void instr_host_on_speed_change(simgrid::s4u::Host& host) +static void on_host_speed_change(s4u::Host const& host) { - simgrid::instr::Container::by_name(host.get_cname()) - ->get_variable("power") + 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_cpu_action_on_state_change(simgrid::surf::CpuAction* action) -{ - simgrid::surf::Cpu* cpu = static_cast(action->get_variable()->get_constraint(0)->get_id()); - TRACE_surf_resource_set_utilization("HOST", "power_used", cpu->get_cname(), action->get_category(), - action->get_variable()->get_value(), action->get_last_update(), - SIMIX_get_clock() - action->get_last_update()); -} - -static void instr_link_on_communication_state_change(simgrid::kernel::resource::NetworkAction* action) +static void on_action_state_change(kernel::resource::Action const& action, + kernel::resource::Action::State /* previous */) { - int n = action->get_variable()->get_number_of_constraint(); + int n = action.get_variable()->get_number_of_constraint(); for (int i = 0; i < n; i++) { - simgrid::kernel::lmm::Constraint* constraint = action->get_variable()->get_constraint(i); - simgrid::kernel::resource::LinkImpl* link = static_cast(constraint->get_id()); - double value = action->get_variable()->get_value() * action->get_variable()->get_constraint_weight(i); - TRACE_surf_resource_set_utilization("LINK", "bandwidth_used", link->get_cname(), action->get_category(), value, - action->get_last_update(), SIMIX_get_clock() - action->get_last_update()); + double value = action.get_variable()->get_value() * action.get_variable()->get_constraint_weight(i); + /* Beware of composite actions: ptasks put links and cpus together. Extra pb: we cannot dynamic_cast from void* */ + kernel::resource::Resource* resource = action.get_variable()->get_constraint(i)->get_id(); + const kernel::resource::Cpu* cpu = dynamic_cast(resource); + + if (cpu != nullptr) + resource_set_utilization("HOST", "speed_used", cpu->get_cname(), action.get_category(), value, + action.get_last_update(), SIMIX_get_clock() - action.get_last_update()); + + const kernel::resource::LinkImpl* link = dynamic_cast(resource); + + if (link != nullptr) + resource_set_utilization("LINK", "bandwidth_used", link->get_cname(), action.get_category(), value, + action.get_last_update(), SIMIX_get_clock() - action.get_last_update()); } } -static void instr_link_on_bandwidth_change(simgrid::s4u::Link& link) + +static void on_link_bandwidth_change(s4u::Link const& link) { - simgrid::instr::Container::by_name(link.get_cname()) + 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) +static void on_netpoint_creation(kernel::routing::NetPoint const& netpoint) { - if (netpoint->is_router()) - new simgrid::instr::RouterContainer(netpoint->get_cname(), currentContainer.back()); + if (netpoint.is_router()) + new RouterContainer(netpoint.get_name(), currentContainer.back()); } -static void instr_on_platform_created() +static void on_platform_created() { currentContainer.clear(); - std::set* filter = new std::set; + std::set* filter = new std::set(); XBT_DEBUG("Starting graph extraction."); - recursiveGraphExtraction(simgrid::s4u::Engine::get_instance()->get_netzone_root(), - simgrid::instr::Container::get_root(), filter); + recursiveGraphExtraction(s4u::Engine::get_instance()->get_netzone_root(), Container::get_root(), filter); XBT_DEBUG("Graph extraction finished."); delete filter; TRACE_paje_dump_buffer(true); } -static void TRACE_actor_kill(smx_process_exit_status_t status, simgrid::s4u::Actor* actor) -{ - if (status == SMX_EXIT_FAILURE) - // kill means that this actor no longer exists, let's destroy it - simgrid::instr::Container::by_name(instr_pid(actor))->remove_from_parent(); -} - -static void instr_actor_on_creation(simgrid::s4u::ActorPtr actor) +static void on_actor_creation(s4u::Actor const& actor) { - container_t root = simgrid::instr::Container::get_root(); - container_t container = simgrid::instr::Container::by_name(actor->get_host()->get_name()); + const Container* root = Container::get_root(); + Container* container = Container::by_name(actor.get_host()->get_name()); - container->create_child(instr_pid(actor.get()), "ACTOR"); - simgrid::instr::ContainerType* actor_type = - container->type_->by_name_or_create("ACTOR"); - simgrid::instr::StateType* state = actor_type->by_name_or_create("ACTOR_STATE"); + container->create_child(instr_pid(actor), "ACTOR"); + ContainerType* actor_type = container->type_->by_name_or_create("ACTOR"); + StateType* state = actor_type->by_name_or_create("ACTOR_STATE"); state->add_entity_value("suspend", "1 0 1"); state->add_entity_value("sleep", "1 1 0"); state->add_entity_value("receive", "1 0 0"); state->add_entity_value("send", "0 0 1"); - state->add_entity_value("task_execute", "0 1 1"); + state->add_entity_value("execute", "0 1 1"); root->type_->by_name_or_create("ACTOR_LINK", actor_type, actor_type); root->type_->by_name_or_create("ACTOR_TASK_LINK", actor_type, actor_type); - actor->on_exit((int_f_pvoid_pvoid_t)TRACE_actor_kill, actor->get_impl()); + std::string container_name = instr_pid(actor); + actor.on_exit([container_name](bool failed) { + if (failed) + // kill means that this actor no longer exists, let's destroy it + Container::by_name(container_name)->remove_from_parent(); + }); } -static long long int counter = 0; - -static void instr_actor_on_migration_start(simgrid::s4u::ActorPtr actor) +static void on_actor_host_change(s4u::Actor const& actor, s4u::Host const& /*previous_location*/) { - // start link - container_t container = simgrid::instr::Container::by_name(instr_pid(actor.get())); - simgrid::instr::Container::get_root()->get_link("ACTOR_LINK")->start_event(container, "M", std::to_string(counter)); + static long long int counter = 0; + container_t container = Container::by_name(instr_pid(actor)); + LinkType* link = Container::get_root()->get_link("ACTOR_LINK"); + // start link + link->start_event(container, "M", std::to_string(counter)); // destroy existing container of this process container->remove_from_parent(); -} - -static void instr_actor_on_migration_end(simgrid::s4u::ActorPtr actor) -{ // create new container on the new_host location - simgrid::instr::Container::by_name(actor->get_host()->get_name())->create_child(instr_pid(actor.get()), "ACTOR"); + Container::by_name(actor.get_host()->get_name())->create_child(instr_pid(actor), "ACTOR"); // end link - simgrid::instr::Container::get_root() - ->get_link("ACTOR_LINK") - ->end_event(simgrid::instr::Container::by_name(instr_pid(actor.get())), "M", std::to_string(counter)); + link->end_event(Container::by_name(instr_pid(actor)), "M", std::to_string(counter)); counter++; } -static void instr_vm_on_creation(simgrid::s4u::Host& host) +static void on_vm_creation(s4u::Host const& host) { - container_t container = new simgrid::instr::HostContainer(host, currentContainer.back()); - container_t root = simgrid::instr::Container::get_root(); - simgrid::instr::ContainerType* vm = container->type_->by_name_or_create("VM"); - simgrid::instr::StateType* state = vm->by_name_or_create("VM_STATE"); + const Container* container = new HostContainer(host, currentContainer.back()); + const Container* root = Container::get_root(); + ContainerType* vm = container->type_->by_name_or_create("VM"); + StateType* state = vm->by_name_or_create("VM_STATE"); state->add_entity_value("suspend", "1 0 1"); state->add_entity_value("sleep", "1 1 0"); state->add_entity_value("receive", "1 0 0"); state->add_entity_value("send", "0 0 1"); - state->add_entity_value("task_execute", "0 1 1"); + state->add_entity_value("execute", "0 1 1"); root->type_->by_name_or_create("VM_LINK", vm, vm); root->type_->by_name_or_create("VM_ACTOR_LINK", vm, vm); } -void instr_define_callbacks() +void define_callbacks() { // always need the callbacks to zones (we need only the root zone), to create the rootContainer and the rootType // properly if (TRACE_needs_platform()) { - simgrid::s4u::on_platform_created.connect(instr_on_platform_created); - simgrid::s4u::Host::on_creation.connect(instr_host_on_creation); - simgrid::s4u::Host::on_speed_change.connect(instr_host_on_speed_change); - simgrid::s4u::Link::on_creation.connect(instr_link_on_creation); - simgrid::s4u::Link::on_bandwidth_change.connect(instr_link_on_bandwidth_change); - simgrid::s4u::NetZone::onSeal.connect([](simgrid::s4u::NetZone& /*netzone*/) { currentContainer.pop_back(); }); - simgrid::kernel::routing::NetPoint::onCreation.connect(instr_netpoint_on_creation); + s4u::Engine::on_platform_created.connect(on_platform_created); + s4u::Host::on_creation.connect(on_host_creation); + s4u::Host::on_speed_change.connect(on_host_speed_change); + s4u::Link::on_creation.connect(on_link_creation); + s4u::Link::on_bandwidth_change.connect(on_link_bandwidth_change); + s4u::NetZone::on_seal.connect([](s4u::NetZone const& /*netzone*/) { currentContainer.pop_back(); }); + kernel::routing::NetPoint::on_creation.connect(on_netpoint_creation); } - simgrid::s4u::NetZone::onCreation.connect(instr_netzone_on_creation); + s4u::NetZone::on_creation.connect(on_netzone_creation); + s4u::Engine::on_time_advance.connect([](double time_delta) { TRACE_paje_dump_buffer(false); }); - simgrid::surf::CpuAction::on_state_change.connect(instr_cpu_action_on_state_change); - simgrid::s4u::Link::on_communication_state_change.connect(instr_link_on_communication_state_change); + kernel::resource::CpuAction::on_state_change.connect(on_action_state_change); + s4u::Link::on_communication_state_change.connect(on_action_state_change); if (TRACE_actor_is_enabled()) { - simgrid::s4u::Actor::on_creation.connect(instr_actor_on_creation); - simgrid::s4u::Actor::on_suspend.connect([](simgrid::s4u::ActorPtr actor) { - simgrid::instr::Container::by_name(instr_pid(actor.get()))->get_state("ACTOR_STATE")->push_event("suspend"); + s4u::Actor::on_creation.connect(on_actor_creation); + s4u::Actor::on_destruction.connect([](s4u::Actor const& actor) { + auto container = Container::by_name_or_null(instr_pid(actor)); + if (container != nullptr) + container->remove_from_parent(); + }); + s4u::Actor::on_suspend.connect([](s4u::Actor const& actor) { + Container::by_name(instr_pid(actor))->get_state("ACTOR_STATE")->push_event("suspend"); + }); + s4u::Actor::on_resume.connect( + [](s4u::Actor const& actor) { Container::by_name(instr_pid(actor))->get_state("ACTOR_STATE")->pop_event(); }); + s4u::Actor::on_sleep.connect([](s4u::Actor const& actor) { + Container::by_name(instr_pid(actor))->get_state("ACTOR_STATE")->push_event("sleep"); + }); + s4u::Actor::on_wake_up.connect( + [](s4u::Actor const& actor) { Container::by_name(instr_pid(actor))->get_state("ACTOR_STATE")->pop_event(); }); + s4u::Exec::on_start.connect([](simgrid::s4u::Actor const& actor, s4u::Exec const&) { + Container::by_name(instr_pid(actor))->get_state("ACTOR_STATE")->push_event("execute"); }); - simgrid::s4u::Actor::on_resume.connect([](simgrid::s4u::ActorPtr actor) { - simgrid::instr::Container::by_name(instr_pid(actor.get()))->get_state("ACTOR_STATE")->pop_event(); + s4u::Exec::on_completion.connect([](s4u::Actor const& actor, s4u::Exec const&) { + Container::by_name(instr_pid(actor))->get_state("ACTOR_STATE")->pop_event(); }); - simgrid::s4u::Actor::on_sleep.connect([](simgrid::s4u::ActorPtr actor) { - simgrid::instr::Container::by_name(instr_pid(actor.get()))->get_state("ACTOR_STATE")->push_event("sleep"); + s4u::Comm::on_sender_start.connect([](s4u::Actor const& actor) { + Container::by_name(instr_pid(actor))->get_state("ACTOR_STATE")->push_event("send"); }); - simgrid::s4u::Actor::on_wake_up.connect([](simgrid::s4u::ActorPtr actor) { - simgrid::instr::Container::by_name(instr_pid(actor.get()))->get_state("ACTOR_STATE")->pop_event(); + s4u::Comm::on_receiver_start.connect([](s4u::Actor const& actor) { + Container::by_name(instr_pid(actor))->get_state("ACTOR_STATE")->push_event("receive"); }); - simgrid::s4u::Actor::on_migration_start.connect(instr_actor_on_migration_start); - simgrid::s4u::Actor::on_migration_end.connect(instr_actor_on_migration_end); + s4u::Comm::on_completion.connect( + [](s4u::Actor const& actor) { Container::by_name(instr_pid(actor))->get_state("ACTOR_STATE")->pop_event(); }); + s4u::Actor::on_host_change.connect(on_actor_host_change); } if (TRACE_vm_is_enabled()) { - simgrid::s4u::Host::on_creation.connect(instr_vm_on_creation); - simgrid::s4u::VirtualMachine::on_start.connect([](simgrid::s4u::VirtualMachine& vm) { - simgrid::instr::Container::by_name(vm.get_name())->get_state("VM_STATE")->push_event("start"); + s4u::Host::on_creation.connect(on_vm_creation); + s4u::VirtualMachine::on_start.connect([](s4u::VirtualMachine const& vm) { + Container::by_name(vm.get_name())->get_state("VM_STATE")->push_event("start"); }); - simgrid::s4u::VirtualMachine::on_started.connect([](simgrid::s4u::VirtualMachine& vm) { - simgrid::instr::Container::by_name(vm.get_name())->get_state("VM_STATE")->pop_event(); + s4u::VirtualMachine::on_started.connect( + [](s4u::VirtualMachine const& vm) { Container::by_name(vm.get_name())->get_state("VM_STATE")->pop_event(); }); + s4u::VirtualMachine::on_suspend.connect([](s4u::VirtualMachine const& vm) { + Container::by_name(vm.get_name())->get_state("VM_STATE")->push_event("suspend"); }); - simgrid::s4u::VirtualMachine::on_suspend.connect([](simgrid::s4u::VirtualMachine& vm) { - simgrid::instr::Container::by_name(vm.get_name())->get_state("VM_STATE")->push_event("suspend"); - }); - simgrid::s4u::VirtualMachine::on_resume.connect([](simgrid::s4u::VirtualMachine& vm) { - simgrid::instr::Container::by_name(vm.get_name())->get_state("VM_STATE")->pop_event(); - }); - simgrid::s4u::Host::on_destruction.connect( - [](simgrid::s4u::Host& host) { simgrid::instr::Container::by_name(host.get_name())->remove_from_parent(); }); + s4u::VirtualMachine::on_resume.connect( + [](s4u::VirtualMachine const& vm) { Container::by_name(vm.get_name())->get_state("VM_STATE")->pop_event(); }); + s4u::Host::on_destruction.connect( + [](s4u::Host const& host) { Container::by_name(host.get_name())->remove_from_parent(); }); } } +} // namespace instr +} // namespace simgrid + /* * 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); @@ -407,82 +430,84 @@ static void recursiveNewVariableType(std::string new_typename, std::string color if (root->get_name() == "LINK") root->by_name_or_create(std::string("b") + new_typename, color); - for (auto elm : root->children_) { - recursiveNewVariableType(new_typename, color, elm.second); + for (auto const& elm : root->children_) { + recursiveNewVariableType(new_typename, color, elm.second.get()); } } -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); } - for (auto elm : root->children_) - recursiveNewUserVariableType(father_type, new_typename, color, elm.second); + for (auto const& elm : root->children_) + recursiveNewUserVariableType(father_type, new_typename, color, elm.second.get()); } -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(new_typename); - for (auto elm : root->children_) - recursiveNewUserStateType(father_type, new_typename, elm.second); + for (auto const& elm : root->children_) + recursiveNewUserStateType(father_type, new_typename, elm.second.get()); } -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) static_cast(root)->add_entity_value(val, color); - for (auto elm : root->children_) - recursiveNewValueForUserStateType(type_name, val, color, elm.second); + for (auto const& elm : root->children_) + recursiveNewValueForUserStateType(type_name, val, color, elm.second.get()); } -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_); } #define GRAPHICATOR_SUPPORT_FUNCTIONS -static void recursiveXBTGraphExtraction(xbt_graph_t graph, std::map* nodes, - std::map* edges, sg_netzone_t netzone, +static void recursiveXBTGraphExtraction(const s_xbt_graph_t* graph, std::map* nodes, + std::map* edges, const_sg_netzone_t netzone, container_t container) { - if (not netzone->getChildren()->empty()) { + if (not netzone->get_children().empty()) { // bottom-up recursion - for (auto const& netzone_child : *netzone->getChildren()) { - container_t child_container = container->children_.at(netzone_child->get_cname()); + for (auto const& netzone_child : netzone->get_children()) { + container_t child_container = container->children_.at(netzone_child->get_name()); recursiveXBTGraphExtraction(graph, nodes, edges, netzone_child, child_container); } } - static_cast(netzone)->get_graph(graph, nodes, edges); + netzone->get_impl()->get_graph(graph, nodes, edges); } xbt_graph_t instr_routing_platform_graph() { xbt_graph_t ret = xbt_graph_new_graph(0, nullptr); - std::map* nodes = new std::map; - std::map* edges = new std::map; + std::map* nodes = new std::map(); + std::map* edges = new std::map(); recursiveXBTGraphExtraction(ret, nodes, edges, simgrid::s4u::Engine::get_instance()->get_netzone_root(), simgrid::instr::Container::get_root()); delete nodes; @@ -490,7 +515,7 @@ xbt_graph_t instr_routing_platform_graph() return ret; } -void instr_routing_platform_graph_export_graphviz(xbt_graph_t g, const char* filename) +void instr_routing_platform_graph_export_graphviz(const s_xbt_graph_t* g, const char* filename) { unsigned int cursor = 0; xbt_node_t node = nullptr;