X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/36b13d80aa850a3ce2ac8255f384ac79ec70fb6f..2fe78f8bc84b3da9ec09542499edeb2189227f61:/src/surf/instr_routing.cpp diff --git a/src/surf/instr_routing.cpp b/src/surf/instr_routing.cpp index c52abdad65..2eb79f75d5 100644 --- a/src/surf/instr_routing.cpp +++ b/src/surf/instr_routing.cpp @@ -6,16 +6,18 @@ #include "src/instr/instr_private.h" -#include "src/surf/AsImpl.hpp" #include "simgrid/s4u/engine.hpp" -#include "surf/surf.h" +#include "simgrid/s4u/host.hpp" +#include "src/kernel/routing/NetZoneImpl.hpp" +#include "src/surf/network_interface.hpp" #include "src/surf/xml/platf_private.hpp" +#include "surf/surf.h" #include "xbt/graph.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_routing, instr, "Tracing platform hierarchy"); static int platform_created = 0; /* indicate whether the platform file has been traced */ -static xbt_dynar_t currentContainer = nullptr; /* push and pop, used only in creation */ +static std::vector currentContainer; /* push and pop, used only in creation */ static const char *instr_node_name (xbt_node_t node) { @@ -24,36 +26,35 @@ static const char *instr_node_name (xbt_node_t node) return str; } - 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; //create an array with all ancestors of a1 - xbt_dynar_t ancestors_a1 = xbt_dynar_new(sizeof(container_t), nullptr); + std::vector ancestors_a1; container_t p; p = a1->father; while (p){ - xbt_dynar_push_as (ancestors_a1, container_t, p); + ancestors_a1.push_back(p); p = p->father; } //create an array with all ancestors of a2 - xbt_dynar_t ancestors_a2 = xbt_dynar_new(sizeof(container_t), nullptr); + std::vector ancestors_a2; p = a2->father; while (p){ - xbt_dynar_push_as (ancestors_a2, container_t, p); + ancestors_a2.push_back(p); p = p->father; } //find the lowest ancestor p = nullptr; - int i = xbt_dynar_length (ancestors_a1) - 1; - int j = xbt_dynar_length (ancestors_a2) - 1; + int i = ancestors_a1.size() - 1; + int j = ancestors_a2.size() - 1; while (i >= 0 && j >= 0){ - container_t a1p = *(container_t*)xbt_dynar_get_ptr (ancestors_a1, i); - container_t a2p = *(container_t*)xbt_dynar_get_ptr (ancestors_a2, j); + container_t a1p = ancestors_a1.at(i); + container_t a2p = ancestors_a2.at(j); if (a1p == a2p){ p = a1p; }else{ @@ -62,8 +63,6 @@ static container_t lowestCommonAncestor (container_t a1, container_t a2) i--; j--; } - xbt_dynar_free (&ancestors_a1); - xbt_dynar_free (&ancestors_a2); return p; } @@ -125,21 +124,21 @@ static void linkContainers (container_t src, container_t dst, xbt_dict_t filter) 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()){ 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_DEBUG("Graph extraction for NetZone = %s", netzone->name()); + if (!xbt_dict_is_empty(netzone->children())) { xbt_dict_cursor_t cursor = nullptr; - AS_t rc_son; + NetZone_t nz_son; char *child_name; //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); + xbt_dict_foreach (netzone->children(), cursor, child_name, nz_son) { + container_t child_container = (container_t)xbt_dict_get(container->children, nz_son->name()); + recursiveGraphExtraction(nz_son, child_container, filter); } } @@ -152,7 +151,7 @@ static void recursiveGraphExtraction (simgrid::s4u::As *as, container_t containe xbt_dict_cursor_t cursor = nullptr; char *edge_name; - static_cast(as)->getGraph(graph, nodes, edges); + static_cast(netzone)->getGraph(graph, nodes, edges); xbt_dict_foreach(edges,cursor,edge_name,edge) { linkContainers( PJ_container_get((const char*) edge->src->data), @@ -187,78 +186,60 @@ void sg_instr_AS_begin(sg_platf_AS_cbarg_t AS) } if (TRACE_needs_platform()){ - currentContainer = xbt_dynar_new (sizeof(container_t), nullptr); - xbt_dynar_push (currentContainer, &root); + currentContainer.push_back(root); } return; } if (TRACE_needs_platform()){ - container_t father = *(container_t*)xbt_dynar_get_ptr(currentContainer, xbt_dynar_length(currentContainer)-1); + container_t father = currentContainer.back(); container_t container = PJ_container_new (id, INSTR_AS, father); - xbt_dynar_push (currentContainer, &container); + currentContainer.push_back(container); } } void sg_instr_AS_end() { if (TRACE_needs_platform()){ - xbt_dynar_pop_ptr (currentContainer); + currentContainer.pop_back(); } } -static void instr_routing_parse_start_link (sg_platf_link_cbarg_t link) +static void instr_routing_parse_start_link(simgrid::surf::Link* link) { - container_t father = *(container_t*)xbt_dynar_get_ptr(currentContainer, xbt_dynar_length(currentContainer)-1); - - double bandwidth_value = link->bandwidth; - double latency_value = link->latency; - xbt_dynar_t links_to_create = xbt_dynar_new (sizeof(char*), &xbt_free_ref); - - if (link->policy == SURF_LINK_FULLDUPLEX){ - char *up = bprintf("%s_UP", link->id); - char *down = bprintf("%s_DOWN", link->id); - xbt_dynar_push_as (links_to_create, char*, xbt_strdup(up)); - xbt_dynar_push_as (links_to_create, char*, xbt_strdup(down)); - free (up); - free (down); - }else{ - xbt_dynar_push_as (links_to_create, char*, strdup(link->id)); - } + if (currentContainer.empty()) // No ongoing parsing. Are you creating the loopback? + return; + container_t father = currentContainer.back(); - char *link_name = nullptr; - unsigned int i; - xbt_dynar_foreach (links_to_create, i, link_name){ + double bandwidth_value = link->bandwidth(); + double latency_value = link->latency(); - container_t container = PJ_container_new (link_name, INSTR_LINK, father); + container_t container = PJ_container_new(link->getName(), 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()) && (! 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_pajeSetVariable(0, container, bandwidth, bandwidth_value); + new_pajeSetVariable(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); } } - - xbt_dynar_free (&links_to_create); } -void sg_instr_new_host(sg_platf_host_cbarg_t host) +void sg_instr_new_host(simgrid::s4u::Host& host) { - container_t father = *(container_t*)xbt_dynar_get_ptr(currentContainer, xbt_dynar_length(currentContainer)-1); - container_t container = PJ_container_new (host->id, INSTR_HOST, father); + container_t father = currentContainer.back(); + container_t container = PJ_container_new(host.cname(), INSTR_HOST, father); if ((TRACE_categorized() || TRACE_uncategorized() || TRACE_platform()) && (! TRACE_disable_speed())) { type_t speed = PJ_type_get_or_null ("power", container->type); @@ -266,8 +247,7 @@ void sg_instr_new_host(sg_platf_host_cbarg_t host) speed = PJ_type_variable_new ("power", nullptr, container->type); } - double current_speed_state; - xbt_dynar_get_cpy(host->speed_per_pstate, host->pstate, ¤t_speed_state); + double current_speed_state = host.getPstateSpeedCurrent(); new_pajeSetVariable (0, container, speed, current_speed_state); } if (TRACE_uncategorized()){ @@ -319,17 +299,16 @@ void sg_instr_new_host(sg_platf_host_cbarg_t host) void sg_instr_new_router(sg_platf_router_cbarg_t router) { - container_t father = *(container_t*)xbt_dynar_get_ptr(currentContainer, xbt_dynar_length(currentContainer)-1); + container_t father = currentContainer.back(); PJ_container_new (router->id, INSTR_ROUTER, father); } static void instr_routing_parse_end_platform () { - xbt_dynar_free(¤tContainer); - currentContainer = nullptr; + 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::instance()->netRoot(), PJ_container_get_root(), filter); XBT_DEBUG ("Graph extraction finished."); xbt_dict_free(&filter); platform_created = 1; @@ -342,7 +321,7 @@ void instr_routing_define_callbacks () //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::Link::onCreation.connect(instr_routing_parse_start_link); simgrid::surf::on_postparse.connect(instr_routing_parse_end_platform); } @@ -440,31 +419,29 @@ 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, NetZone_t netzone, + container_t container) { - if (!xbt_dict_is_empty(as->children())){ + if (!xbt_dict_is_empty(netzone->children())) { xbt_dict_cursor_t cursor = nullptr; - AS_t as_child; + NetZone_t netzone_child; char *child_name; //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); + xbt_dict_foreach (netzone->children(), cursor, child_name, netzone_child) { + container_t child_container = (container_t)xbt_dict_get(container->children, netzone_child->name()); + 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 (void) +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::instance()->netRoot(), PJ_container_get_root()); xbt_dict_free (&nodes); xbt_dict_free (&edges); return ret;