X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/72d32c4e88a57f4786f62fec48a1bfa454adbff9..HEAD:/src/instr/instr_platform.cpp diff --git a/src/instr/instr_platform.cpp b/src/instr/instr_platform.cpp index 5594252798..f7cbcc9dca 100644 --- a/src/instr/instr_platform.cpp +++ b/src/instr/instr_platform.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2010-2022. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2010-2023. 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,9 +14,9 @@ #include #include "src/instr/instr_private.hpp" +#include "src/kernel/activity/ExecImpl.hpp" #include "src/kernel/resource/CpuImpl.hpp" #include "src/kernel/resource/NetworkModel.hpp" -#include "src/surf/surf_interface.hpp" #include @@ -24,7 +24,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(instr_routing, instr, "Tracing platform hierarch std::string instr_pid(simgrid::s4u::Actor const& proc) { - return std::string(proc.get_name()) + "-" + std::to_string(proc.get_pid()); + return proc.get_name() + "-" + std::to_string(proc.get_pid()); } static simgrid::instr::Container* lowestCommonAncestor(const simgrid::instr::Container* a1, @@ -142,10 +142,10 @@ static void recursiveNewVariableType(const std::string& new_typename, const std: simgrid::instr::Type* root) { if (root->get_name() == "HOST" || root->get_name() == "VM") - root->by_name_or_create(std::string("p") + new_typename, color); + root->by_name_or_create("p" + new_typename, color); if (root->get_name() == "LINK") - root->by_name_or_create(std::string("b") + new_typename, color); + root->by_name_or_create("b" + new_typename, color); for (auto const& [_, child] : root->get_children()) { recursiveNewVariableType(new_typename, color, child.get()); @@ -222,32 +222,53 @@ void platform_graph_export_graphviz(const std::string& output_filename) xbt_assert(not fs.fail(), "Failed to open %s", output_filename.c_str()); if (g->directed) - fs << "digraph test {" << std::endl; + fs << "digraph test {\n"; else - fs << "graph test {" << std::endl; + fs << "graph test {\n"; - fs << " graph [overlap=scale]" << std::endl; + fs << " graph [overlap=scale]\n"; - fs << " node [shape=box, style=filled]" << std::endl; - fs << " node [width=.3, height=.3, style=filled, color=skyblue]" << std::endl << std::endl; + fs << " node [shape=box, style=filled]\n"; + fs << " node [width=.3, height=.3, style=filled, color=skyblue]\n\n"; for (auto const& [node, _] : nodes) - fs << " \"" << node << "\";" << std::endl; + fs << " \"" << node << "\";\n"; 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; + fs << " \"" << src_s << "\" -> \"" << dst_s << "\";\n"; else - fs << " \"" << src_s << "\" -- \"" << dst_s << "\";" << std::endl; + fs << " \"" << src_s << "\" -- \"" << dst_s << "\";\n"; } - fs << "}" << std::endl; + fs << "}\n"; fs.close(); xbt_graph_free_graph(g, xbt_free_f, xbt_free_f, nullptr); } +void platform_graph_export_csv(const std::string& output_filename) +{ + auto* g = xbt_graph_new_graph(0, nullptr); + std::map> nodes; + std::map> edges; + s4u::Engine::get_instance()->get_netzone_root()->extract_xbt_graph(g, &nodes, &edges); + + std::ofstream fs; + fs.open(output_filename, std::ofstream::out); + xbt_assert(not fs.fail(), "Failed to open %s", output_filename.c_str()); + + fs << "src,dst" << std::endl; + for (auto const& [_, edge] : edges) { + const char* src_s = static_cast(edge->src->data); + const char* dst_s = static_cast(edge->dst->data); + fs << src_s << "," << dst_s << "\n"; + } + fs.close(); + xbt_graph_free_graph(g, xbt_free_f, xbt_free_f, nullptr); +} + /* Callbacks */ static std::vector currentContainer; /* push and pop, used only in creation */ static void on_netzone_creation(s4u::NetZone const& netzone) @@ -327,6 +348,15 @@ static void on_host_creation(s4u::Host const& host) root->get_type()->by_name_or_create("MIGRATE_LINK", mpi, mpi); mpi->by_name_or_create("MIGRATE_STATE"); } + + if (TRACE_actor_is_enabled()) { + auto* host_type = container->get_type(); + auto* state = host_type->by_name_or_create("HOST_STATE"); + state->set_calling_container(container); + state->add_entity_value("receive", "1 0 0"); + state->add_entity_value("send", "0 0 1"); + state->add_entity_value("execute", "0 1 1"); + } } static void on_action_state_change(kernel::resource::Action const& action, @@ -342,12 +372,17 @@ static void on_action_state_change(kernel::resource::Action const& action, resource_set_utilization("HOST", "speed_used", cpu->get_cname(), action.get_category(), value, action.get_last_update(), simgrid_get_clock() - action.get_last_update()); - if (const auto* link = dynamic_cast(resource)) + else 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()); } } +static void on_activity_suspend_resume(s4u::Activity const& activity) +{ + on_action_state_change(*activity.get_impl()->model_action_, /*ignored*/ kernel::resource::Action::State::STARTED); +} + static void on_platform_created() { currentContainer.clear(); @@ -429,9 +464,11 @@ void define_callbacks() 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()); + ->set_event( + simgrid_get_clock(), + static_cast(link.get_impl()->get_model())->get_bandwidth_factor() * + link.get_bandwidth()); }); - 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()); @@ -440,14 +477,15 @@ void define_callbacks() s4u::NetZone::on_creation_cb(on_netzone_creation); - kernel::resource::CpuAction::on_state_change.connect(on_action_state_change); + s4u::Host::on_exec_state_change_cb(on_action_state_change); s4u::Link::on_communication_state_change_cb(on_action_state_change); + s4u::Exec::on_suspend_cb(on_activity_suspend_resume); + s4u::Exec::on_resume_cb(on_activity_suspend_resume); if (TRACE_actor_is_enabled()) { 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) + if (auto* container = Container::by_name_or_null(instr_pid(actor))) container->remove_from_parent(); }); s4u::Actor::on_suspend_cb([](s4u::Actor const& actor) { @@ -460,11 +498,38 @@ void define_callbacks() }); 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_cb([](s4u::Exec const&) { - Container::by_name(instr_pid(*s4u::Actor::self()))->get_state("ACTOR_STATE")->push_event("execute"); + + s4u::Exec::on_start_cb([](s4u::Exec const& e) { + std::string pid = instr_pid(*s4u::Actor::self()); + if (pid == "-0") //Exec is launched directly by Maestro, use the host as container + Container::by_name(e.get_host()->get_name())->get_state("HOST_STATE")->push_event("execute"); + else + Container::by_name(pid)->get_state("ACTOR_STATE")->push_event("execute"); }); - s4u::Activity::on_completion_cb([](const s4u::Activity&) { - Container::by_name(instr_pid(*s4u::Actor::self()))->get_state("ACTOR_STATE")->pop_event(); + + s4u::Exec::on_completion_cb([](const s4u::Exec& e) { + std::string pid = instr_pid(*s4u::Actor::self()); + if (pid == "-0") //Exec is launched directly by Maestro, use the host as container + Container::by_name(e.get_host()->get_name())->get_state("HOST_STATE")->pop_event(); + else + Container::by_name(pid)->get_state("ACTOR_STATE")->pop_event(); + }); + + s4u::Comm::on_completion_cb([](const s4u::Comm& c) { + if (c.get_sender()) { + Container::by_name(instr_pid(*c.get_sender()))->get_state("ACTOR_STATE")->pop_event(); + Container::by_name(instr_pid(*c.get_receiver()))->get_state("ACTOR_STATE")->pop_event(); + } else { + Container::by_name(c.get_source()->get_name())->get_state("HOST_STATE")->pop_event(); + Container::by_name(c.get_destination()->get_name())->get_state("HOST_STATE")->pop_event(); + } + }); + s4u::Comm::on_start_cb([](s4u::Comm const& c) { + std::string pid = instr_pid(*s4u::Actor::self()); + if (pid == "-0") { //Comm is launched directly by Maestro, use the host as container + Container::by_name(c.get_source()->get_name())->get_state("HOST_STATE")->push_event("start"); + Container::by_name(c.get_destination()->get_name())->get_state("HOST_STATE")->push_event("start"); + } }); s4u::Comm::on_send_cb([](s4u::Comm const&) { Container::by_name(instr_pid(*s4u::Actor::self()))->get_state("ACTOR_STATE")->push_event("send"); @@ -477,14 +542,12 @@ void define_callbacks() if (TRACE_smpi_is_enabled() && TRACE_smpi_is_computing()) { s4u::Exec::on_start_cb([](s4u::Exec const& exec) { - Container::by_name(std::string("rank-") + std::to_string(s4u::Actor::self()->get_pid())) + Container::by_name("rank-" + std::to_string(s4u::Actor::self()->get_pid())) ->get_state("MPI_STATE") ->push_event("computing", new CpuTIData("compute", exec.get_cost())); }); - 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(); + s4u::Exec::on_completion_cb([](const s4u::Exec&) { + Container::by_name("rank-" + std::to_string(s4u::Actor::self()->get_pid()))->get_state("MPI_STATE")->pop_event(); }); }