X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/36516b5e5bbd43b0cc0cf541e1fc1d3cd4c4dbcf..2dab73b61a6ad4feb7d2d267bf5621c7b95926b3:/src/instr/instr_platform.cpp diff --git a/src/instr/instr_platform.cpp b/src/instr/instr_platform.cpp index 0cc9680736..b2d214c92a 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,11 +29,6 @@ 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) { // this is only an optimization (since most of a1 and a2 share the same parent) @@ -153,12 +150,117 @@ static void recursiveGraphExtraction(const simgrid::s4u::NetZone* netzone, conta } /* - * 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) +{ + xbt_graph_t g = xbt_graph_new_graph(0, nullptr); + std::map* nodes = new std::map(); + std::map* edges = new std::map(); + 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); + delete nodes; + delete edges; +} + +/* Callbacks */ static std::vector currentContainer; /* push and pop, used only in creation */ static void on_netzone_creation(s4u::NetZone const& netzone) { @@ -204,6 +306,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"); } @@ -236,13 +339,6 @@ static void on_host_creation(s4u::Host const& host) } } -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 */) { @@ -266,19 +362,6 @@ 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(); @@ -287,15 +370,16 @@ static void on_platform_created() 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"); + container->create_child(container_name, "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"); @@ -304,9 +388,7 @@ static void on_actor_creation(s4u::Actor const& actor) 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 @@ -353,14 +435,25 @@ 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); - s4u::Engine::on_time_advance.connect([](double /*time_delta*/) { TRACE_paje_dump_buffer(false); }); kernel::resource::CpuAction::on_state_change.connect(on_action_state_change); s4u::Link::on_communication_state_change.connect(on_action_state_change); @@ -399,6 +492,17 @@ void define_callbacks() s4u::Actor::on_host_change.connect(on_actor_host_change); } + if (TRACE_smpi_is_enabled() && TRACE_smpi_is_computing()) { + s4u::Exec::on_start.connect([](simgrid::s4u::Actor const& actor, s4u::Exec const& exec) { + Container::by_name(std::string("rank-") + std::to_string(actor.get_pid())) + ->get_state("MPI_STATE") + ->push_event("computing", new CpuTIData("compute", exec.get_cost())); + }); + s4u::Exec::on_completion.connect([](s4u::Actor const& actor, s4u::Exec const&) { + Container::by_name(std::string("rank-") + std::to_string(actor.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) { @@ -417,132 +521,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_); -} - -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); -}