X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a22eb0ac7d22d5beaa6e33adf8f85c28dac59024..1366b293e8c700b12567e45076cf0e6b7a25478f:/src/surf/instr_routing.cpp diff --git a/src/surf/instr_routing.cpp b/src/surf/instr_routing.cpp index b28c1e0612..7044975d24 100644 --- a/src/surf/instr_routing.cpp +++ b/src/surf/instr_routing.cpp @@ -1,14 +1,15 @@ -/* Copyright (c) 2010, 2012-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2010-2017. 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. */ #include "src/instr/instr_private.h" -#include "simgrid/s4u/engine.hpp" -#include "simgrid/s4u/host.hpp" +#include "simgrid/s4u/Engine.hpp" +#include "simgrid/s4u/Host.hpp" #include "src/kernel/routing/NetZoneImpl.hpp" +#include "src/kernel/routing/NetPoint.hpp" +#include "src/surf/network_interface.hpp" #include "src/surf/xml/platf_private.hpp" #include "surf/surf.h" #include "xbt/graph.h" @@ -21,19 +22,18 @@ static std::vector currentContainer; /* push and pop, used only in static const char *instr_node_name (xbt_node_t node) { void *data = xbt_graph_node_get_data(node); - char *str = (char*)data; - return str; + return static_cast(data); } static container_t lowestCommonAncestor (container_t a1, container_t a2) { //this is only an optimization (since most of a1 and a2 share the same parent) - if (a1->father == a2->father) return a1->father; + if (a1->father == a2->father) + return a1->father; //create an array with all ancestors of a1 std::vector ancestors_a1; - container_t p; - p = a1->father; + container_t p = a1->father; while (p){ ancestors_a1.push_back(p); p = p->father; @@ -75,13 +75,14 @@ static void linkContainers (container_t src, container_t dst, xbt_dict_t filter) //find common father container_t father = lowestCommonAncestor (src, dst); - if (!father){ + if (not father) { xbt_die ("common father unknown, this is a tracing problem"); } if (filter != nullptr){ //check if we already register this pair (we only need one direction) - char aux1[INSTR_DEFAULT_STR_SIZE], aux2[INSTR_DEFAULT_STR_SIZE]; + char aux1[INSTR_DEFAULT_STR_SIZE]; + char aux2[INSTR_DEFAULT_STR_SIZE]; snprintf (aux1, INSTR_DEFAULT_STR_SIZE, "%s%s", src->name, dst->name); snprintf (aux2, INSTR_DEFAULT_STR_SIZE, "%s%s", dst->name, src->name); if (xbt_dict_get_or_null (filter, aux1)){ @@ -116,62 +117,58 @@ static void linkContainers (container_t src, container_t dst, xbt_dict_t filter) static long long counter = 0; char key[INSTR_DEFAULT_STR_SIZE]; - snprintf (key, INSTR_DEFAULT_STR_SIZE, "%lld", counter++); - new_pajeStartLink(SIMIX_get_clock(), father, link_type, src, "topology", key); - new_pajeEndLink(SIMIX_get_clock(), father, link_type, dst, "topology", key); + snprintf (key, INSTR_DEFAULT_STR_SIZE, "%lld", counter); + counter++; + + new StartLinkEvent(SIMIX_get_clock(), father, link_type, src, "topology", key); + new EndLinkEvent(SIMIX_get_clock(), father, link_type, dst, "topology", key); XBT_DEBUG (" linkContainers %s <-> %s", src->name, dst->name); } -static void recursiveGraphExtraction (simgrid::s4u::As *as, container_t container, xbt_dict_t filter) +static void recursiveGraphExtraction(simgrid::s4u::NetZone* netzone, container_t container, xbt_dict_t filter) { - if (!TRACE_platform_topology()){ + if (not TRACE_platform_topology()) { XBT_DEBUG("Graph extraction disabled by user."); return; } - XBT_DEBUG ("Graph extraction for routing_component = %s", as->name()); - if (!xbt_dict_is_empty(as->children())){ - xbt_dict_cursor_t cursor = nullptr; - AS_t rc_son; - char *child_name; + XBT_DEBUG("Graph extraction for NetZone = %s", netzone->getCname()); + if (not netzone->getChildren()->empty()) { //bottom-up recursion - xbt_dict_foreach(as->children(), cursor, child_name, rc_son) { - container_t child_container = (container_t) xbt_dict_get (container->children, rc_son->name()); - recursiveGraphExtraction (rc_son, child_container, filter); + for (auto nz_son : *netzone->getChildren()) { + container_t child_container = static_cast(xbt_dict_get(container->children, nz_son->getCname())); + recursiveGraphExtraction(nz_son, child_container, filter); } } - { - xbt_graph_t graph = xbt_graph_new_graph (0, nullptr); - xbt_dict_t nodes = xbt_dict_new_homogeneous(nullptr); - xbt_dict_t edges = xbt_dict_new_homogeneous(nullptr); - xbt_edge_t edge = nullptr; + xbt_graph_t graph = xbt_graph_new_graph (0, nullptr); + xbt_dict_t nodes = xbt_dict_new_homogeneous(nullptr); + xbt_dict_t edges = xbt_dict_new_homogeneous(nullptr); + xbt_edge_t edge = nullptr; - xbt_dict_cursor_t cursor = nullptr; - char *edge_name; + xbt_dict_cursor_t cursor = nullptr; + char *edge_name; - static_cast(as)->getGraph(graph, nodes, edges); - xbt_dict_foreach(edges,cursor,edge_name,edge) { - linkContainers( - PJ_container_get((const char*) edge->src->data), - PJ_container_get((const char*) edge->dst->data), filter); - } - xbt_dict_free (&nodes); - xbt_dict_free (&edges); - xbt_graph_free_graph(graph, xbt_free_f, xbt_free_f, nullptr); + static_cast(netzone)->getGraph(graph, nodes, edges); + xbt_dict_foreach(edges,cursor,edge_name,edge) { + linkContainers( + PJ_container_get(static_cast(edge->src->data)), + PJ_container_get(static_cast(edge->dst->data)), filter); } + xbt_dict_free (&nodes); + xbt_dict_free (&edges); + xbt_graph_free_graph(graph, xbt_free_f, xbt_free_f, nullptr); } /* * Callbacks */ -void sg_instr_AS_begin(sg_platf_AS_cbarg_t AS) +static void sg_instr_AS_begin(simgrid::s4u::NetZone& netzone) { - const char*id = AS->id; + const char* id = netzone.getCname(); if (PJ_container_get_root() == nullptr){ PJ_container_alloc (); - PJ_type_alloc(); container_t root = PJ_container_new (id, INSTR_AS, nullptr); PJ_container_set_root (root); @@ -179,7 +176,8 @@ void sg_instr_AS_begin(sg_platf_AS_cbarg_t AS) type_t mpi = PJ_type_get_or_null ("MPI", root->type); if (mpi == nullptr){ mpi = PJ_type_container_new("MPI", root->type); - if (!TRACE_smpi_is_grouped()) PJ_type_state_new ("MPI_STATE", mpi); + if (not TRACE_smpi_is_grouped()) + PJ_type_state_new ("MPI_STATE", mpi); PJ_type_link_new ("MPI_LINK", PJ_type_get_root(), mpi, mpi); } } @@ -197,68 +195,57 @@ void sg_instr_AS_begin(sg_platf_AS_cbarg_t AS) } } -void sg_instr_AS_end() +static void sg_instr_AS_end(simgrid::s4u::NetZone& /*netzone*/) { if (TRACE_needs_platform()){ currentContainer.pop_back(); } } -static void instr_routing_parse_start_link (sg_platf_link_cbarg_t link) +static void instr_routing_parse_start_link(simgrid::s4u::Link& link) { + if (currentContainer.empty()) // No ongoing parsing. Are you creating the loopback? + return; container_t father = currentContainer.back(); - double bandwidth_value = link->bandwidth; - double latency_value = link->latency; - std::vector links_to_create; - - if (link->policy == SURF_LINK_FULLDUPLEX){ - std::string id (link->id); - std::string up = id + "_UP"; - std::string down = id + "_DOWN"; - links_to_create.push_back(up); - links_to_create.push_back(down); - }else{ - links_to_create.push_back(link->id); - } + double bandwidth_value = link.bandwidth(); + double latency_value = link.latency(); - for (auto link_name: links_to_create){ - container_t container = PJ_container_new (link_name.c_str(), INSTR_LINK, father); + container_t container = PJ_container_new(link.name(), INSTR_LINK, father); - if ((TRACE_categorized() || TRACE_uncategorized() || TRACE_platform()) && (! TRACE_disable_link())) { - type_t bandwidth = PJ_type_get_or_null ("bandwidth", container->type); - if (bandwidth == nullptr){ - bandwidth = PJ_type_variable_new ("bandwidth", nullptr, container->type); - } - type_t latency = PJ_type_get_or_null ("latency", container->type); - if (latency == nullptr){ - latency = PJ_type_variable_new ("latency", nullptr, container->type); - } - new_pajeSetVariable (0, container, bandwidth, bandwidth_value); - new_pajeSetVariable (0, container, latency, latency_value); + if ((TRACE_categorized() || TRACE_uncategorized() || TRACE_platform()) && (not TRACE_disable_link())) { + type_t bandwidth = PJ_type_get_or_null("bandwidth", container->type); + if (bandwidth == nullptr) { + bandwidth = PJ_type_variable_new("bandwidth", nullptr, container->type); } - if (TRACE_uncategorized()){ - type_t bandwidth_used = PJ_type_get_or_null ("bandwidth_used", container->type); - if (bandwidth_used == nullptr){ - PJ_type_variable_new ("bandwidth_used", "0.5 0.5 0.5", container->type); - } + type_t latency = PJ_type_get_or_null("latency", container->type); + if (latency == nullptr) { + latency = PJ_type_variable_new("latency", nullptr, container->type); + } + new SetVariableEvent(0, container, bandwidth, bandwidth_value); + new SetVariableEvent(0, container, latency, latency_value); + } + if (TRACE_uncategorized()) { + type_t bandwidth_used = PJ_type_get_or_null("bandwidth_used", container->type); + if (bandwidth_used == nullptr) { + PJ_type_variable_new("bandwidth_used", "0.5 0.5 0.5", container->type); } } } -void sg_instr_new_host(simgrid::s4u::Host& host) -{ +static void sg_instr_new_host(simgrid::s4u::Host& host) +{ paje_value pj_value; container_t father = currentContainer.back(); - container_t container = PJ_container_new(host.cname(), INSTR_HOST, father); + container_t container = PJ_container_new(host.getCname(), INSTR_HOST, father); - if ((TRACE_categorized() || TRACE_uncategorized() || TRACE_platform()) && (! TRACE_disable_speed())) { + if ((TRACE_categorized() || TRACE_uncategorized() || TRACE_platform()) && (not TRACE_disable_speed())) { type_t speed = PJ_type_get_or_null ("power", container->type); if (speed == nullptr){ speed = PJ_type_variable_new ("power", nullptr, container->type); } - double current_speed_state = host.getPstateSpeedCurrent(); - new_pajeSetVariable (0, container, speed, current_speed_state); + double current_speed_state = host.getSpeed(); + new SetVariableEvent (0, container, speed, current_speed_state); } if (TRACE_uncategorized()){ type_t speed_used = PJ_type_get_or_null ("power_used", container->type); @@ -280,11 +267,11 @@ void sg_instr_new_host(simgrid::s4u::Host& host) if (msg_process == nullptr){ msg_process = PJ_type_container_new("MSG_PROCESS", container->type); type_t state = PJ_type_state_new ("MSG_PROCESS_STATE", msg_process); - PJ_value_new ("suspend", "1 0 1", state); - PJ_value_new ("sleep", "1 1 0", state); - PJ_value_new ("receive", "1 0 0", state); - PJ_value_new ("send", "0 0 1", state); - PJ_value_new ("task_execute", "0 1 1", state); + s_val PJ_value("suspend", "1 0 1", state); + PJ_value.PJ_value_update("sleep", "1 1 0", state); + PJ_value.PJ_value_update("receive", "1 0 0", state); + PJ_value.PJ_value_update("send", "0 0 1", state); + PJ_value.PJ_value_update("task_execute", "0 1 1", state); PJ_type_link_new ("MSG_PROCESS_LINK", PJ_type_get_root(), msg_process, msg_process); PJ_type_link_new ("MSG_PROCESS_TASK_LINK", PJ_type_get_root(), msg_process, msg_process); } @@ -295,11 +282,11 @@ void sg_instr_new_host(simgrid::s4u::Host& host) if (msg_vm == nullptr){ msg_vm = PJ_type_container_new("MSG_VM", container->type); type_t state = PJ_type_state_new ("MSG_VM_STATE", msg_vm); - PJ_value_new ("suspend", "1 0 1", state); - PJ_value_new ("sleep", "1 1 0", state); - PJ_value_new ("receive", "1 0 0", state); - PJ_value_new ("send", "0 0 1", state); - PJ_value_new ("task_execute", "0 1 1", state); + s_val PJ_value("suspend", "1 0 1", state); + PJ_value.PJ_value_update ("sleep", "1 1 0", state); + PJ_value.PJ_value_update ("receive", "1 0 0", state); + PJ_value.PJ_value_update ("send", "0 0 1", state); + PJ_value.PJ_value_update ("task_execute", "0 1 1", state); PJ_type_link_new ("MSG_VM_LINK", PJ_type_get_root(), msg_vm, msg_vm); PJ_type_link_new ("MSG_VM_PROCESS_LINK", PJ_type_get_root(), msg_vm, msg_vm); } @@ -307,10 +294,14 @@ void sg_instr_new_host(simgrid::s4u::Host& host) } -void sg_instr_new_router(sg_platf_router_cbarg_t router) +static void sg_instr_new_router(simgrid::kernel::routing::NetPoint * netpoint) { - container_t father = currentContainer.back(); - PJ_container_new (router->id, INSTR_ROUTER, father); + if (not netpoint->isRouter()) + return; + if (TRACE_is_enabled() && TRACE_needs_platform()) { + container_t father = currentContainer.back(); + PJ_container_new(netpoint->cname(), INSTR_ROUTER, father); + } } static void instr_routing_parse_end_platform () @@ -318,7 +309,7 @@ static void instr_routing_parse_end_platform () currentContainer.clear(); xbt_dict_t filter = xbt_dict_new_homogeneous(xbt_free_f); XBT_DEBUG ("Starting graph extraction."); - recursiveGraphExtraction (simgrid::s4u::Engine::instance()->rootAs(), PJ_container_get_root(), filter); + recursiveGraphExtraction(simgrid::s4u::Engine::getInstance()->getNetRoot(), PJ_container_get_root(), filter); XBT_DEBUG ("Graph extraction finished."); xbt_dict_free(&filter); platform_created = 1; @@ -327,30 +318,35 @@ static void instr_routing_parse_end_platform () void instr_routing_define_callbacks () { - if (!TRACE_is_enabled()) return; //always need the call backs to ASes (we need only the root AS), //to create the rootContainer and the rootType properly - if (!TRACE_needs_platform()) return; - simgrid::surf::on_link.connect(instr_routing_parse_start_link); - simgrid::surf::on_postparse.connect(instr_routing_parse_end_platform); + if (not TRACE_is_enabled()) + return; + if (TRACE_needs_platform()) { + simgrid::s4u::Link::onCreation.connect(instr_routing_parse_start_link); + simgrid::s4u::onPlatformCreated.connect(instr_routing_parse_end_platform); + simgrid::s4u::Host::onCreation.connect(sg_instr_new_host); + } + simgrid::s4u::NetZone::onCreation.connect(sg_instr_AS_begin); + simgrid::s4u::NetZone::onSeal.connect(sg_instr_AS_end); + simgrid::kernel::routing::NetPoint::onCreation.connect(&sg_instr_new_router); } - /* * user categories support */ static void recursiveNewVariableType (const char *new_typename, const char *color, type_t root) { - if (!strcmp (root->name, "HOST")){ + if (not strcmp(root->name, "HOST")) { char tnstr[INSTR_DEFAULT_STR_SIZE]; snprintf (tnstr, INSTR_DEFAULT_STR_SIZE, "p%s", new_typename); PJ_type_variable_new (tnstr, color, root); } - if (!strcmp (root->name, "MSG_VM")){ + if (not strcmp(root->name, "MSG_VM")) { char tnstr[INSTR_DEFAULT_STR_SIZE]; snprintf (tnstr, INSTR_DEFAULT_STR_SIZE, "p%s", new_typename); PJ_type_variable_new (tnstr, color, root); } - if (!strcmp (root->name, "LINK")){ + if (not strcmp(root->name, "LINK")) { char tnstr[INSTR_DEFAULT_STR_SIZE]; snprintf (tnstr, INSTR_DEFAULT_STR_SIZE, "b%s", new_typename); PJ_type_variable_new (tnstr, color, root); @@ -370,7 +366,7 @@ void instr_new_variable_type (const char *new_typename, const char *color) static void recursiveNewUserVariableType (const char *father_type, const char *new_typename, const char *color, type_t root) { - if (!strcmp (root->name, father_type)){ + if (not strcmp(root->name, father_type)) { PJ_type_variable_new (new_typename, color, root); } xbt_dict_cursor_t cursor = nullptr; @@ -388,7 +384,7 @@ void instr_new_user_variable_type (const char *father_type, const char *new_typ static void recursiveNewUserStateType (const char *father_type, const char *new_typename, type_t root) { - if (!strcmp (root->name, father_type)){ + if (not strcmp(root->name, father_type)) { PJ_type_state_new (new_typename, root); } xbt_dict_cursor_t cursor = nullptr; @@ -405,9 +401,9 @@ void instr_new_user_state_type (const char *father_type, const char *new_typenam } static void recursiveNewValueForUserStateType (const char *type_name, const char *value, const char *color, type_t root) -{ - if (!strcmp (root->name, type_name)){ - PJ_value_new (value, color, root); +{ paje_value pj_value; + if (not strcmp(root->name, type_name)) { + s_val PJ_value (value, color, root); } xbt_dict_cursor_t cursor = nullptr; type_t child_type; @@ -429,22 +425,19 @@ int instr_platform_traced () #define GRAPHICATOR_SUPPORT_FUNCTIONS -static void recursiveXBTGraphExtraction (xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges, - AS_t as, container_t container) +static void recursiveXBTGraphExtraction(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges, sg_netzone_t netzone, + container_t container) { - if (!xbt_dict_is_empty(as->children())){ - xbt_dict_cursor_t cursor = nullptr; - AS_t as_child; - char *child_name; + if (not netzone->getChildren()->empty()) { //bottom-up recursion - xbt_dict_foreach(as->children(), cursor, child_name, as_child) { - container_t child_container = (container_t) xbt_dict_get ( - container->children, as_child->name()); - recursiveXBTGraphExtraction (graph, nodes, edges, as_child, child_container); + for (auto netzone_child : *netzone->getChildren()) { + container_t child_container = + static_cast(xbt_dict_get(container->children, netzone_child->getCname())); + recursiveXBTGraphExtraction(graph, nodes, edges, netzone_child, child_container); } } - static_cast(as)->getGraph(graph, nodes, edges); + static_cast(netzone)->getGraph(graph, nodes, edges); } xbt_graph_t instr_routing_platform_graph () @@ -452,7 +445,8 @@ xbt_graph_t instr_routing_platform_graph () xbt_graph_t ret = xbt_graph_new_graph (0, nullptr); xbt_dict_t nodes = xbt_dict_new_homogeneous(nullptr); xbt_dict_t edges = xbt_dict_new_homogeneous(nullptr); - recursiveXBTGraphExtraction (ret, nodes, edges, simgrid::s4u::Engine::instance()->rootAs(), PJ_container_get_root()); + recursiveXBTGraphExtraction(ret, nodes, edges, simgrid::s4u::Engine::getInstance()->getNetRoot(), + PJ_container_get_root()); xbt_dict_free (&nodes); xbt_dict_free (&edges); return ret; @@ -463,9 +457,8 @@ void instr_routing_platform_graph_export_graphviz (xbt_graph_t g, const char *fi unsigned int cursor = 0; xbt_node_t node = nullptr; xbt_edge_t edge = nullptr; - FILE *file = nullptr; - file = fopen(filename, "w"); + FILE *file = fopen(filename, "w"); xbt_assert(file, "Failed to open %s \n", filename); if (g->directed) @@ -476,8 +469,7 @@ void instr_routing_platform_graph_export_graphviz (xbt_graph_t g, const char *fi 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"); + 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)); @@ -492,5 +484,4 @@ void instr_routing_platform_graph_export_graphviz (xbt_graph_t g, const char *fi } fprintf(file, "}\n"); fclose(file); - }