X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1f5cc4e090af49a98da0e25e9ee21a8ce6ce30f8..cee8b7d98f1c3b6738ad5f0b20de7bed9ba08d5a:/src/instr/instr_platform.cpp diff --git a/src/instr/instr_platform.cpp b/src/instr/instr_platform.cpp index 3d83425728..83cd96603d 100644 --- a/src/instr/instr_platform.cpp +++ b/src/instr/instr_platform.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2010-2021. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2010-2022. 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. */ @@ -14,10 +14,9 @@ #include #include "src/instr/instr_private.hpp" -#include "src/surf/cpu_interface.hpp" -#include "src/surf/network_interface.hpp" +#include "src/kernel/resource/CpuImpl.hpp" +#include "src/kernel/resource/NetworkModel.hpp" #include "src/surf/surf_interface.hpp" -#include "src/surf/xml/platf_private.hpp" #include @@ -51,12 +50,9 @@ static simgrid::instr::Container* lowestCommonAncestor(const simgrid::instr::Con int j = static_cast(ancestors_a2.size()) - 1; while (i >= 0 && j >= 0) { simgrid::instr::Container* a1p = ancestors_a1.at(i); - const simgrid::instr::Container* a2p = ancestors_a2.at(j); - if (a1p == a2p) { - p = a1p; - } else { + if (a1p != ancestors_a2.at(j)) break; - } + p = a1p; i--; j--; } @@ -132,8 +128,7 @@ static void recursiveGraphExtraction(const simgrid::s4u::NetZone* netzone, const std::map> edges; netzone->get_impl()->get_graph(graph, &nodes, &edges); - for (auto const& elm : edges) { - const xbt_edge* edge = elm.second; + for (auto const& [_, edge] : edges) { linkContainers(simgrid::instr::Container::by_name(static_cast(edge->src->data)), simgrid::instr::Container::by_name(static_cast(edge->dst->data)), filter); } @@ -152,8 +147,8 @@ static void recursiveNewVariableType(const std::string& new_typename, const std: if (root->get_name() == "LINK") root->by_name_or_create(std::string("b") + new_typename, color); - for (auto const& elm : root->get_children()) { - recursiveNewVariableType(new_typename, color, elm.second.get()); + for (auto const& [_, child] : root->get_children()) { + recursiveNewVariableType(new_typename, color, child.get()); } } @@ -168,8 +163,8 @@ static void recursiveNewUserVariableType(const std::string& parent_type, const s if (root->get_name() == parent_type) { root->by_name_or_create(new_typename, color); } - for (auto const& elm : root->get_children()) - recursiveNewUserVariableType(parent_type, new_typename, color, elm.second.get()); + for (auto const& [_, child] : root->get_children()) + recursiveNewUserVariableType(parent_type, new_typename, color, child.get()); } void instr_new_user_variable_type(const std::string& parent_type, const std::string& new_typename, @@ -184,8 +179,8 @@ static void recursiveNewUserStateType(const std::string& parent_type, const std: if (root->get_name() == parent_type) root->by_name_or_create(new_typename); - for (auto const& elm : root->get_children()) - recursiveNewUserStateType(parent_type, new_typename, elm.second.get()); + for (auto const& [_, child] : root->get_children()) + recursiveNewUserStateType(parent_type, new_typename, child.get()); } void instr_new_user_state_type(const std::string& parent_type, const std::string& new_typename) @@ -199,8 +194,8 @@ static void recursiveNewValueForUserStateType(const std::string& type_name, cons if (root->get_name() == type_name) static_cast(root)->add_entity_value(val, color); - for (auto const& elm : root->get_children()) - recursiveNewValueForUserStateType(type_name, val, color, elm.second.get()); + for (auto const& [_, child] : root->get_children()) + recursiveNewValueForUserStateType(type_name, val, color, child.get()); } void instr_new_value_for_user_state_type(const std::string& type_name, const char* value, const std::string& color) @@ -211,6 +206,11 @@ void instr_new_value_for_user_state_type(const std::string& type_name, const cha namespace simgrid { namespace instr { +/** @brief Creates a file with the topology of the platform file used for the simulator. + * + * The graph topology will have the following properties: all hosts, links and routers of the platform file are mapped + * to graph nodes; routes are mapped to edges. The platform's zones are not represented in the output. + */ void platform_graph_export_graphviz(const std::string& output_filename) { auto* g = xbt_graph_new_graph(0, nullptr); @@ -232,12 +232,12 @@ void platform_graph_export_graphviz(const std::string& output_filename) fs << " node [shape=box, style=filled]" << std::endl; fs << " node [width=.3, height=.3, style=filled, color=skyblue]" << std::endl << std::endl; - for (auto const& elm : nodes) - fs << " \"" << elm.first << "\";" << std::endl; + for (auto const& [node, _] : nodes) + fs << " \"" << node << "\";" << std::endl; - for (auto const& elm : edges) { - const char* src_s = static_cast(elm.second->src->data); - const char* dst_s = static_cast(elm.second->dst->data); + for (auto const& [_, edge] : edges) { + const char* src_s = static_cast(edge->src->data); + const char* dst_s = static_cast(edge->dst->data); if (g->directed) fs << " \"" << src_s << "\" -> \"" << dst_s << "\";" << std::endl; else @@ -339,15 +339,11 @@ static void on_action_state_change(kernel::resource::Action const& action, double value = action.get_rate() * 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::CpuImpl* cpu = dynamic_cast(resource); - - if (cpu != nullptr) + if (const auto* cpu = dynamic_cast(resource)) resource_set_utilization("HOST", "speed_used", cpu->get_cname(), action.get_category(), value, action.get_last_update(), simgrid_get_clock() - action.get_last_update()); - const kernel::resource::LinkImpl* link = dynamic_cast(resource); - - if (link != nullptr) + if (const auto* link = dynamic_cast(resource)) resource_set_utilization("LINK", "bandwidth_used", link->get_cname(), action.get_category(), value, action.get_last_update(), simgrid_get_clock() - action.get_last_update()); } @@ -423,72 +419,70 @@ 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()) { - s4u::Engine::on_platform_created.connect(on_platform_created); - s4u::Host::on_creation.connect(on_host_creation); - s4u::Host::on_speed_change.connect([](s4u::Host const& host) { + s4u::Engine::on_platform_created_cb(on_platform_created); + s4u::Host::on_creation_cb(on_host_creation); + s4u::Host::on_speed_change_cb([](s4u::Host const& host) { Container::by_name(host.get_name()) ->get_variable("speed") ->set_event(simgrid_get_clock(), host.get_core_count() * host.get_available_speed()); }); - s4u::Link::on_creation.connect(on_link_creation); - s4u::Link::on_bandwidth_change.connect([](s4u::Link const& link) { + s4u::Link::on_creation_cb(on_link_creation); + s4u::Link::on_bandwidth_change_cb([](s4u::Link const& link) { Container::by_name(link.get_name()) ->get_variable("bandwidth") ->set_event(simgrid_get_clock(), sg_bandwidth_factor * link.get_bandwidth()); }); - s4u::NetZone::on_seal.connect([](s4u::NetZone const& /*netzone*/) { currentContainer.pop_back(); }); + s4u::NetZone::on_seal_cb([](s4u::NetZone const& /*netzone*/) { currentContainer.pop_back(); }); kernel::routing::NetPoint::on_creation.connect([](kernel::routing::NetPoint const& netpoint) { if (netpoint.is_router()) new RouterContainer(netpoint.get_name(), currentContainer.back()); }); } - s4u::NetZone::on_creation.connect(on_netzone_creation); + s4u::NetZone::on_creation_cb(on_netzone_creation); kernel::resource::CpuAction::on_state_change.connect(on_action_state_change); - s4u::Link::on_communication_state_change.connect(on_action_state_change); + s4u::Link::on_communication_state_change_cb(on_action_state_change); if (TRACE_actor_is_enabled()) { - s4u::Actor::on_creation.connect(on_actor_creation); - s4u::Actor::on_destruction.connect([](s4u::Actor const& actor) { + s4u::Actor::on_creation_cb(on_actor_creation); + s4u::Actor::on_destruction_cb([](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) { + s4u::Actor::on_suspend_cb([](s4u::Actor const& actor) { Container::by_name(instr_pid(actor))->get_state("ACTOR_STATE")->push_event("suspend"); }); - s4u::Actor::on_resume.connect( + s4u::Actor::on_resume_cb( [](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) { + s4u::Actor::on_sleep_cb([](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::on_wake_up_cb( [](s4u::Actor const& actor) { Container::by_name(instr_pid(actor))->get_state("ACTOR_STATE")->pop_event(); }); - s4u::Exec::on_start.connect([](s4u::Exec const&) { + s4u::Exec::on_start_cb([](s4u::Exec const&) { Container::by_name(instr_pid(*s4u::Actor::self()))->get_state("ACTOR_STATE")->push_event("execute"); }); - s4u::Exec::on_completion.connect([](s4u::Exec const&) { + s4u::Activity::on_completion_cb([](const s4u::Activity&) { Container::by_name(instr_pid(*s4u::Actor::self()))->get_state("ACTOR_STATE")->pop_event(); }); - s4u::Comm::on_start.connect([](s4u::Comm const&, bool is_sender) { - Container::by_name(instr_pid(*s4u::Actor::self())) - ->get_state("ACTOR_STATE") - ->push_event(is_sender ? "send" : "receive"); + s4u::Comm::on_send_cb([](s4u::Comm const&) { + Container::by_name(instr_pid(*s4u::Actor::self()))->get_state("ACTOR_STATE")->push_event("send"); }); - s4u::Comm::on_completion.connect([](s4u::Comm const&) { - Container::by_name(instr_pid(*s4u::Actor::self()))->get_state("ACTOR_STATE")->pop_event(); + s4u::Comm::on_recv_cb([](s4u::Comm const&) { + Container::by_name(instr_pid(*s4u::Actor::self()))->get_state("ACTOR_STATE")->push_event("receive"); }); - s4u::Actor::on_host_change.connect(on_actor_host_change); + s4u::Actor::on_host_change_cb(on_actor_host_change); } if (TRACE_smpi_is_enabled() && TRACE_smpi_is_computing()) { - s4u::Exec::on_start.connect([](s4u::Exec const& exec) { + s4u::Exec::on_start_cb([](s4u::Exec const& exec) { Container::by_name(std::string("rank-") + std::to_string(s4u::Actor::self()->get_pid())) ->get_state("MPI_STATE") ->push_event("computing", new CpuTIData("compute", exec.get_cost())); }); - s4u::Exec::on_completion.connect([](s4u::Exec const&) { + s4u::Activity::on_completion_cb([](const s4u::Activity&) { Container::by_name(std::string("rank-") + std::to_string(s4u::Actor::self()->get_pid())) ->get_state("MPI_STATE") ->pop_event(); @@ -496,18 +490,18 @@ void define_callbacks() } if (TRACE_vm_is_enabled()) { - s4u::Host::on_creation.connect(on_vm_creation); - s4u::VirtualMachine::on_start.connect([](s4u::VirtualMachine const& vm) { + s4u::Host::on_creation_cb(on_vm_creation); + s4u::VirtualMachine::on_start_cb([](s4u::VirtualMachine const& vm) { Container::by_name(vm.get_name())->get_state("VM_STATE")->push_event("start"); }); - s4u::VirtualMachine::on_started.connect( + s4u::VirtualMachine::on_started_cb( [](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) { + s4u::VirtualMachine::on_suspend_cb([](s4u::VirtualMachine const& vm) { Container::by_name(vm.get_name())->get_state("VM_STATE")->push_event("suspend"); }); - s4u::VirtualMachine::on_resume.connect( + s4u::VirtualMachine::on_resume_cb( [](s4u::VirtualMachine const& vm) { Container::by_name(vm.get_name())->get_state("VM_STATE")->pop_event(); }); - s4u::Host::on_destruction.connect( + s4u::Host::on_destruction_cb( [](s4u::Host const& host) { Container::by_name(host.get_name())->remove_from_parent(); }); } }