X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6570fa4001065f73218c9869364aba76b91de04e..b372d23d3d8818b4547ef207f43b45709298a002:/src/instr/instr_platform.cpp diff --git a/src/instr/instr_platform.cpp b/src/instr/instr_platform.cpp index 072dd2dc38..c8936419b4 100644 --- a/src/instr/instr_platform.cpp +++ b/src/instr/instr_platform.cpp @@ -20,6 +20,8 @@ #include "surf/surf.hpp" #include "xbt/graph.h" +#include + XBT_LOG_NEW_DEFAULT_SUBCATEGORY(instr_routing, instr, "Tracing platform hierarchy"); std::string instr_pid(simgrid::s4u::Actor const& proc) @@ -27,39 +29,29 @@ 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(const s_xbt_node_t* node) -{ - return static_cast(xbt_graph_node_get_data(node)); -} - -static container_t lowestCommonAncestor(const simgrid::instr::Container* a1, const simgrid::instr::Container* a2) +static simgrid::instr::Container* 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_) return a1->father_; // create an array with all ancestors of a1 - std::vector ancestors_a1; - container_t p = a1->father_; - while (p) { + std::vector ancestors_a1; + for (auto* p = a1->father_; p != nullptr; p = p->father_) ancestors_a1.push_back(p); - p = p->father_; - } // create an array with all ancestors of a2 - std::vector ancestors_a2; - p = a2->father_; - while (p) { + std::vector ancestors_a2; + for (auto* p = a2->father_; p != nullptr; p = p->father_) ancestors_a2.push_back(p); - p = p->father_; - } // find the lowest ancestor - p = nullptr; - int i = ancestors_a1.size() - 1; - int j = ancestors_a2.size() - 1; + simgrid::instr::Container* p = nullptr; + int i = static_cast(ancestors_a1.size()) - 1; + int j = static_cast(ancestors_a2.size()) - 1; while (i >= 0 && j >= 0) { - container_t a1p = ancestors_a1.at(i); + simgrid::instr::Container* a1p = ancestors_a1.at(i); const simgrid::instr::Container* a2p = ancestors_a2.at(j); if (a1p == a2p) { p = a1p; @@ -72,7 +64,8 @@ static container_t lowestCommonAncestor(const simgrid::instr::Container* a1, con return p; } -static void linkContainers(container_t src, container_t dst, std::set* filter) +static void linkContainers(simgrid::instr::Container* src, simgrid::instr::Container* dst, + std::set>* filter) { // ignore loopback if (src->get_name() == "__loopback__" || dst->get_name() == "__loopback__") { @@ -81,7 +74,7 @@ static void linkContainers(container_t src, container_t dst, std::set %s", src->get_cname(), dst->get_cname()); } -static void recursiveGraphExtraction(const simgrid::s4u::NetZone* netzone, container_t container, - std::set* filter) +static void recursiveGraphExtraction(const simgrid::s4u::NetZone* netzone, simgrid::instr::Container* container, + std::set>* filter) { if (not TRACE_platform_topology()) { XBT_DEBUG("Graph extraction disabled by user."); @@ -132,47 +125,147 @@ static void recursiveGraphExtraction(const simgrid::s4u::NetZone* netzone, conta 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_name()); + simgrid::instr::Container* 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(); + auto* graph = xbt_graph_new_graph(0, nullptr); + std::map> nodes; + std::map> edges; - netzone->get_impl()->get_graph(graph, nodes, edges); - for (auto elm : *edges) { + netzone->get_impl()->get_graph(graph, &nodes, &edges); + for (auto const& elm : edges) { 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); } - delete nodes; - delete edges; xbt_graph_free_graph(graph, xbt_free_f, xbt_free_f, nullptr); } /* - * Callbacks + * user categories support */ +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); + + 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()); + } +} + +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(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 const& elm : root->get_children()) + recursiveNewUserVariableType(father_type, new_typename, color, elm.second.get()); +} + +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(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 const& elm : root->get_children()) + recursiveNewUserStateType(father_type, new_typename, elm.second.get()); +} + +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(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 const& elm : root->get_children()) + recursiveNewValueForUserStateType(type_name, val, color, elm.second.get()); +} + +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_); +} namespace simgrid { namespace instr { +void platform_graph_export_graphviz(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()); + + if (g->directed) + fs << "digraph test {" << std::endl; + else + fs << "graph test {" << std::endl; + + fs << " graph [overlap=scale]" << std::endl; + + 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& elm : edges) { + const char* src_s = static_cast(elm.second->src->data); + const char* dst_s = static_cast(elm.second->dst->data); + if (g->directed) + fs << " \"" << src_s << "\" -> \"" << dst_s << "\";" << std::endl; + else + fs << " \"" << src_s << "\" -- \"" << dst_s << "\";" << std::endl; + } + fs << "}" << std::endl; + 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) { std::string id = netzone.get_name(); if (Container::get_root() == nullptr) { - NetZoneContainer* root = new NetZoneContainer(id, 0, nullptr); + auto* root = new NetZoneContainer(id, 0, nullptr); xbt_assert(Container::get_root() == root); if (TRACE_smpi_is_enabled()) { - ContainerType* mpi = root->type_->by_name_or_create("MPI"); + auto* mpi = root->type_->by_name_or_create("MPI"); if (not TRACE_smpi_is_grouped()) 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"); } @@ -184,7 +277,8 @@ static void on_netzone_creation(s4u::NetZone const& netzone) } if (TRACE_needs_platform()) { - NetZoneContainer* container = new NetZoneContainer(id, currentContainer.size(), currentContainer.back()); + auto level = static_cast(currentContainer.size()); + auto* container = new NetZoneContainer(id, level, currentContainer.back()); currentContainer.push_back(container); } } @@ -194,7 +288,7 @@ static void on_link_creation(s4u::Link const& link) if (currentContainer.empty()) // No ongoing parsing. Are you creating the loopback? return; - Container* container = new Container(link.get_name(), "LINK", currentContainer.back()); + auto* container = new Container(link.get_name(), "LINK", currentContainer.back()); if ((TRACE_categorized() || TRACE_uncategorized() || TRACE_platform()) && (not TRACE_disable_link())) { VariableType* bandwidth = container->type_->by_name_or_create("bandwidth", ""); @@ -204,6 +298,7 @@ static void on_link_creation(s4u::Link const& link) latency->set_calling_container(container); latency->set_event(0, link.get_latency()); } + if (TRACE_uncategorized()) { container->type_->by_name_or_create("bandwidth_used", "0.5 0.5 0.5"); } @@ -228,27 +323,19 @@ static void on_host_creation(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()) { - ContainerType* mpi = container->type_->by_name_or_create("MPI"); + auto* 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"); } } -static void on_host_speed_change(s4u::Host const& host) -{ - Container::by_name(host.get_name()) - ->get_variable("speed") - ->set_event(surf_get_clock(), host.get_core_count() * host.get_available_speed()); -} - 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(); + auto n = static_cast(action.get_variable()->get_number_of_constraint()); - for (int i = 0; i < n; i++) { + for (unsigned 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* */ kernel::resource::Resource* resource = action.get_variable()->get_constraint(i)->get_id(); @@ -266,47 +353,32 @@ static void on_action_state_change(kernel::resource::Action const& action, } } -static void on_link_bandwidth_change(s4u::Link const& link) -{ - Container::by_name(link.get_name()) - ->get_variable("bandwidth") - ->set_event(surf_get_clock(), sg_bandwidth_factor * link.get_bandwidth()); -} - -static void on_netpoint_creation(kernel::routing::NetPoint const& netpoint) -{ - if (netpoint.is_router()) - new RouterContainer(netpoint.get_name(), currentContainer.back()); -} - static void on_platform_created() { currentContainer.clear(); - std::set* filter = new std::set(); + std::set> filter; XBT_DEBUG("Starting graph extraction."); - recursiveGraphExtraction(s4u::Engine::get_instance()->get_netzone_root(), 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); + dump_buffer(true); } static void on_actor_creation(s4u::Actor const& actor) { - const Container* root = Container::get_root(); - Container* container = Container::by_name(actor.get_host()->get_name()); + const Container* root = Container::get_root(); + Container* container = Container::by_name(actor.get_host()->get_name()); + std::string container_name = instr_pid(actor); - 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"); + container->create_child(container_name, "ACTOR"); + auto* actor_type = container->type_->by_name_or_create("ACTOR"); + auto* 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("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); - 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 @@ -317,7 +389,7 @@ static void on_actor_creation(s4u::Actor const& actor) static void on_actor_host_change(s4u::Actor const& actor, s4u::Host const& /*previous_location*/) { static long long int counter = 0; - container_t container = Container::by_name(instr_pid(actor)); + Container* container = Container::by_name(instr_pid(actor)); LinkType* link = Container::get_root()->get_link("ACTOR_LINK"); // start link @@ -335,8 +407,8 @@ static void on_vm_creation(s4u::Host const& host) { 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"); + auto* vm = container->type_->by_name_or_create("VM"); + auto* 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"); @@ -353,12 +425,24 @@ void define_callbacks() 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(on_host_speed_change); + s4u::Host::on_speed_change.connect([](s4u::Host const& host) { + Container::by_name(host.get_name()) + ->get_variable("speed") + ->set_event(surf_get_clock(), host.get_core_count() * host.get_available_speed()); + }); s4u::Link::on_creation.connect(on_link_creation); - s4u::Link::on_bandwidth_change.connect(on_link_bandwidth_change); + s4u::Link::on_bandwidth_change.connect([](s4u::Link const& link) { + Container::by_name(link.get_name()) + ->get_variable("bandwidth") + ->set_event(surf_get_clock(), sg_bandwidth_factor * link.get_bandwidth()); + }); s4u::NetZone::on_seal.connect([](s4u::NetZone const& /*netzone*/) { currentContainer.pop_back(); }); - kernel::routing::NetPoint::on_creation.connect(on_netpoint_creation); + 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); kernel::resource::CpuAction::on_state_change.connect(on_action_state_change); @@ -381,23 +465,36 @@ void define_callbacks() }); 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"); + s4u::Exec::on_start.connect([](s4u::Exec const&) { + Container::by_name(instr_pid(*s4u::Actor::self()))->get_state("ACTOR_STATE")->push_event("execute"); }); - s4u::Exec::on_completion.connect([](s4u::Actor const& actor, s4u::Exec const&) { - Container::by_name(instr_pid(actor))->get_state("ACTOR_STATE")->pop_event(); + s4u::Exec::on_completion.connect([](s4u::Exec const&) { + Container::by_name(instr_pid(*s4u::Actor::self()))->get_state("ACTOR_STATE")->pop_event(); }); - s4u::Comm::on_sender_start.connect([](s4u::Actor const& actor) { - Container::by_name(instr_pid(actor))->get_state("ACTOR_STATE")->push_event("send"); + 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_receiver_start.connect([](s4u::Actor const& actor) { - Container::by_name(instr_pid(actor))->get_state("ACTOR_STATE")->push_event("receive"); + 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_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_smpi_is_enabled() && TRACE_smpi_is_computing()) { + s4u::Exec::on_start.connect([](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&) { + Container::by_name(std::string("rank-") + std::to_string(s4u::Actor::self()->get_pid())) + ->get_state("MPI_STATE") + ->pop_event(); + }); + } + if (TRACE_vm_is_enabled()) { s4u::Host::on_creation.connect(on_vm_creation); s4u::VirtualMachine::on_start.connect([](s4u::VirtualMachine const& vm) { @@ -416,134 +513,3 @@ void define_callbacks() } } // namespace instr } // namespace simgrid - -/* - * user categories support - */ -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); - - if (root->get_name() == "LINK") - root->by_name_or_create(std::string("b") + new_typename, color); - - for (auto const& elm : root->children_) { - recursiveNewVariableType(new_typename, color, elm.second.get()); - } -} - -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(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 const& elm : root->children_) - recursiveNewUserVariableType(father_type, new_typename, color, elm.second.get()); -} - -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(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 const& elm : root->children_) - recursiveNewUserStateType(father_type, new_typename, elm.second.get()); -} - -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(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 const& elm : root->children_) - recursiveNewValueForUserStateType(type_name, val, color, elm.second.get()); -} - -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(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()) { - // bottom-up recursion - 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); - } - } - - 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(); - recursiveXBTGraphExtraction(ret, nodes, edges, simgrid::s4u::Engine::get_instance()->get_netzone_root(), - simgrid::instr::Container::get_root()); - delete nodes; - delete edges; - return ret; -} - -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; - xbt_edge_t edge = nullptr; - - FILE* file = fopen(filename, "w"); - xbt_assert(file, "Failed to open %s \n", filename); - - if (g->directed) - fprintf(file, "digraph test {\n"); - else - fprintf(file, "graph test {\n"); - - fprintf(file, " graph [overlap=scale]\n"); - - fprintf(file, " node [shape=box, style=filled]\n"); - fprintf(file, " node [width=.3, height=.3, style=filled, color=skyblue]\n\n"); - - xbt_dynar_foreach (g->nodes, cursor, node) { - fprintf(file, " \"%s\";\n", instr_node_name(node)); - } - xbt_dynar_foreach (g->edges, cursor, edge) { - const char* src_s = instr_node_name(edge->src); - const char* dst_s = instr_node_name(edge->dst); - if (g->directed) - fprintf(file, " \"%s\" -> \"%s\";\n", src_s, dst_s); - else - fprintf(file, " \"%s\" -- \"%s\";\n", src_s, dst_s); - } - fprintf(file, "}\n"); - fclose(file); -}