X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5ab070a2054636f5dcf5f0b56d691b089c5d16e4..36516b5e5bbd43b0cc0cf541e1fc1d3cd4c4dbcf:/src/instr/instr_platform.cpp diff --git a/src/instr/instr_platform.cpp b/src/instr/instr_platform.cpp index fa042a83ac..0cc9680736 100644 --- a/src/instr/instr_platform.cpp +++ b/src/instr/instr_platform.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2010-2019. 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. */ @@ -22,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_) @@ -57,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 { @@ -106,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; @@ -121,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()) { @@ -138,12 +138,12 @@ static void recursiveGraphExtraction(simgrid::s4u::NetZone* netzone, container_t } 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(); 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); } @@ -155,21 +155,26 @@ static void recursiveGraphExtraction(simgrid::s4u::NetZone* netzone, container_t /* * Callbacks */ -static void instr_netzone_on_creation(simgrid::s4u::NetZone const& 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); - xbt_assert(simgrid::instr::Container::get_root() == root); + 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()) { @@ -179,24 +184,23 @@ static void instr_netzone_on_creation(simgrid::s4u::NetZone const& 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 const& 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()); } @@ -205,17 +209,17 @@ static void instr_link_on_creation(simgrid::s4u::Link const& link) } } -static void instr_host_on_creation(simgrid::s4u::Host const& 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* speed = container->type_->by_name_or_create("speed", ""); + VariableType* speed = container->type_->by_name_or_create("speed", ""); speed->set_calling_container(container); speed->set_event(0, host.get_speed()); - simgrid::instr::VariableType* cores = container->type_->by_name_or_create("core_count", ""); + VariableType* cores = container->type_->by_name_or_create("core_count", ""); cores->set_calling_container(container); cores->set_event(0, host.get_core_count()); } @@ -224,78 +228,76 @@ static void instr_host_on_creation(simgrid::s4u::Host const& host) 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 const& host) +static void on_host_speed_change(s4u::Host const& host) { - simgrid::instr::Container::by_name(host.get_name()) + 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_action_on_state_change(simgrid::kernel::resource::Action const& action, - simgrid::kernel::resource::Action::State /* previous */) +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(); for (int i = 0; i < n; i++) { 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* */ - simgrid::kernel::resource::Resource* resource = action.get_variable()->get_constraint(i)->get_id(); - simgrid::kernel::resource::Cpu* cpu = dynamic_cast(resource); + kernel::resource::Resource* resource = action.get_variable()->get_constraint(i)->get_id(); + const kernel::resource::Cpu* cpu = dynamic_cast(resource); if (cpu != nullptr) - TRACE_surf_resource_set_utilization("HOST", "speed_used", cpu->get_cname(), action.get_category(), value, - action.get_last_update(), SIMIX_get_clock() - action.get_last_update()); + resource_set_utilization("HOST", "speed_used", cpu->get_cname(), action.get_category(), value, + action.get_last_update(), SIMIX_get_clock() - action.get_last_update()); - simgrid::kernel::resource::LinkImpl* link = dynamic_cast(resource); + const kernel::resource::LinkImpl* link = dynamic_cast(resource); if (link != nullptr) - 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()); + 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 const& link) +static void on_link_bandwidth_change(s4u::Link const& link) { - simgrid::instr::Container::by_name(link.get_name()) + 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 const& netpoint) +static void on_netpoint_creation(kernel::routing::NetPoint const& netpoint) { if (netpoint.is_router()) - new simgrid::instr::RouterContainer(netpoint.get_name(), currentContainer.back()); + 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 instr_actor_on_creation(simgrid::s4u::Actor const& 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), "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"); + 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"); @@ -308,39 +310,33 @@ static void instr_actor_on_creation(simgrid::s4u::Actor const& actor) actor.on_exit([container_name](bool failed) { if (failed) // kill means that this actor no longer exists, let's destroy it - simgrid::instr::Container::by_name(container_name)->remove_from_parent(); + Container::by_name(container_name)->remove_from_parent(); }); } -static long long int counter = 0; - -static void instr_actor_on_migration_start(simgrid::s4u::Actor const& 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)); - 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::Actor const& actor) -{ // create new container on the new_host location - simgrid::instr::Container::by_name(actor.get_host()->get_name())->create_child(instr_pid(actor), "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)), "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 const& 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"); @@ -350,82 +346,78 @@ static void instr_vm_on_creation(simgrid::s4u::Host const& host) 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::Engine::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::on_seal.connect( - [](simgrid::s4u::NetZone const& /*netzone*/) { currentContainer.pop_back(); }); - simgrid::kernel::routing::NetPoint::on_creation.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::on_creation.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::kernel::resource::CpuAction::on_state_change.connect(instr_action_on_state_change); - simgrid::s4u::Link::on_communication_state_change.connect(instr_action_on_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_destruction.connect([](simgrid::s4u::Actor const& actor) { - auto container = simgrid::instr::Container::by_name_or_null(instr_pid(actor)); + 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(); }); - simgrid::s4u::Actor::on_suspend.connect([](simgrid::s4u::Actor const& actor) { - simgrid::instr::Container::by_name(instr_pid(actor))->get_state("ACTOR_STATE")->push_event("suspend"); - }); - simgrid::s4u::Actor::on_resume.connect([](simgrid::s4u::Actor const& actor) { - simgrid::instr::Container::by_name(instr_pid(actor))->get_state("ACTOR_STATE")->pop_event(); - }); - simgrid::s4u::Actor::on_sleep.connect([](simgrid::s4u::Actor const& actor) { - simgrid::instr::Container::by_name(instr_pid(actor))->get_state("ACTOR_STATE")->push_event("sleep"); + s4u::Actor::on_suspend.connect([](s4u::Actor const& actor) { + Container::by_name(instr_pid(actor))->get_state("ACTOR_STATE")->push_event("suspend"); }); - simgrid::s4u::Actor::on_wake_up.connect([](simgrid::s4u::Actor const& actor) { - simgrid::instr::Container::by_name(instr_pid(actor))->get_state("ACTOR_STATE")->pop_event(); + 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"); }); - simgrid::s4u::Exec::on_start.connect([](simgrid::s4u::Actor const& actor) { - simgrid::instr::Container::by_name(instr_pid(actor))->get_state("ACTOR_STATE")->push_event("execute"); + 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::Exec::on_completion.connect([](simgrid::s4u::Actor const& actor) { - simgrid::instr::Container::by_name(instr_pid(actor))->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::Comm::on_sender_start.connect([](simgrid::s4u::Actor const& actor) { - simgrid::instr::Container::by_name(instr_pid(actor))->get_state("ACTOR_STATE")->push_event("send"); + 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::Comm::on_receiver_start.connect([](simgrid::s4u::Actor const& actor) { - simgrid::instr::Container::by_name(instr_pid(actor))->get_state("ACTOR_STATE")->push_event("receive"); + 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::Comm::on_completion.connect([](simgrid::s4u::Actor const& actor) { - simgrid::instr::Container::by_name(instr_pid(actor))->get_state("ACTOR_STATE")->pop_event(); - }); - 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 const& vm) { - simgrid::instr::Container::by_name(vm.get_name())->get_state("VM_STATE")->push_event("start"); - }); - simgrid::s4u::VirtualMachine::on_started.connect([](simgrid::s4u::VirtualMachine const& vm) { - simgrid::instr::Container::by_name(vm.get_name())->get_state("VM_STATE")->pop_event(); + 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_suspend.connect([](simgrid::s4u::VirtualMachine const& 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 const& vm) { - simgrid::instr::Container::by_name(vm.get_name())->get_state("VM_STATE")->pop_event(); - }); - simgrid::s4u::Host::on_destruction.connect([](simgrid::s4u::Host const& host) { - simgrid::instr::Container::by_name(host.get_name())->remove_from_parent(); + 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"); }); + 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 */ @@ -494,10 +486,8 @@ void instr_new_value_for_user_state_type(const std::string& type_name, const cha 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->get_children().empty()) { @@ -514,8 +504,8 @@ static void recursiveXBTGraphExtraction(xbt_graph_t graph, 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; @@ -523,7 +513,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;