X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/be5b1909ae03fa305b6aff11ef16e19de82966b5..390ee57ed79bf7577c2bce6df6a25aba57ff476e:/src/surf/instr_routing.cpp diff --git a/src/surf/instr_routing.cpp b/src/surf/instr_routing.cpp index 1512a6a2c6..d0c5cb8fa8 100644 --- a/src/surf/instr_routing.cpp +++ b/src/surf/instr_routing.cpp @@ -6,16 +6,17 @@ #include "src/instr/instr_private.h" -#include "simgrid/s4u/as.hpp" #include "simgrid/s4u/engine.hpp" -#include "surf/surf.h" +#include "simgrid/s4u/host.hpp" +#include "src/kernel/routing/AsImpl.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 = NULL; /* 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 +25,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), NULL); + 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), NULL); + 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 = NULL; - int i = xbt_dynar_length (ancestors_a1) - 1; - int j = xbt_dynar_length (ancestors_a2) - 1; + p = nullptr; + 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 +62,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; } @@ -81,7 +79,7 @@ static void linkContainers (container_t src, container_t dst, xbt_dict_t filter) xbt_die ("common father unknown, this is a tracing problem"); } - if (filter != NULL){ + 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]; snprintf (aux1, INSTR_DEFAULT_STR_SIZE, "%s%s", src->name, dst->name); @@ -96,8 +94,8 @@ static void linkContainers (container_t src, container_t dst, xbt_dict_t filter) } //ok, not found, register it - xbt_dict_set (filter, aux1, xbt_strdup ("1"), NULL); - xbt_dict_set (filter, aux2, xbt_strdup ("1"), NULL); + xbt_dict_set (filter, aux1, xbt_strdup ("1"), nullptr); + xbt_dict_set (filter, aux2, xbt_strdup ("1"), nullptr); } //declare type @@ -107,12 +105,12 @@ static void linkContainers (container_t src, container_t dst, xbt_dict_t filter) src->type->name, src->type->id, dst->type->name, dst->type->id); type_t link_type = PJ_type_get_or_null (link_typename, father->type); - if (link_type == NULL){ + if (link_type == nullptr){ link_type = PJ_type_link_new (link_typename, father->type, src->type, dst->type); } //register EDGE types for triva configuration - xbt_dict_set (trivaEdgeTypes, link_type->name, xbt_strdup("1"), NULL); + xbt_dict_set (trivaEdgeTypes, link_type->name, xbt_strdup("1"), nullptr); //create the link static long long counter = 0; @@ -133,7 +131,7 @@ static void recursiveGraphExtraction (simgrid::s4u::As *as, container_t containe } XBT_DEBUG ("Graph extraction for routing_component = %s", as->name()); if (!xbt_dict_is_empty(as->children())){ - xbt_dict_cursor_t cursor = NULL; + xbt_dict_cursor_t cursor = nullptr; AS_t rc_son; char *child_name; //bottom-up recursion @@ -144,15 +142,15 @@ static void recursiveGraphExtraction (simgrid::s4u::As *as, container_t containe } { - xbt_graph_t graph = xbt_graph_new_graph (0, NULL); - xbt_dict_t nodes = xbt_dict_new_homogeneous(NULL); - xbt_dict_t edges = xbt_dict_new_homogeneous(NULL); - xbt_edge_t edge = NULL; + 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 = NULL; + xbt_dict_cursor_t cursor = nullptr; char *edge_name; - as->getGraph(graph, nodes, edges); + static_cast(as)->getGraph(graph, nodes, edges); xbt_dict_foreach(edges,cursor,edge_name,edge) { linkContainers( PJ_container_get((const char*) edge->src->data), @@ -160,7 +158,7 @@ static void recursiveGraphExtraction (simgrid::s4u::As *as, container_t containe } xbt_dict_free (&nodes); xbt_dict_free (&edges); - xbt_graph_free_graph(graph, xbt_free_f, xbt_free_f, NULL); + xbt_graph_free_graph(graph, xbt_free_f, xbt_free_f, nullptr); } } @@ -171,126 +169,115 @@ void sg_instr_AS_begin(sg_platf_AS_cbarg_t AS) { const char*id = AS->id; - if (PJ_container_get_root() == NULL){ + if (PJ_container_get_root() == nullptr){ PJ_container_alloc (); PJ_type_alloc(); - container_t root = PJ_container_new (id, INSTR_AS, NULL); + container_t root = PJ_container_new (id, INSTR_AS, nullptr); PJ_container_set_root (root); if (TRACE_smpi_is_enabled()) { - if (!TRACE_smpi_is_grouped()){ - type_t mpi = PJ_type_get_or_null ("MPI", root->type); - if (mpi == NULL){ - mpi = PJ_type_container_new("MPI", root->type); - PJ_type_state_new ("MPI_STATE", mpi); - PJ_type_link_new ("MPI_LINK", PJ_type_get_root(), mpi, mpi); - } + 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); + PJ_type_link_new ("MPI_LINK", PJ_type_get_root(), mpi, mpi); } } if (TRACE_needs_platform()){ - currentContainer = xbt_dynar_new (sizeof(container_t), NULL); - 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) { - container_t father = *(container_t*)xbt_dynar_get_ptr(currentContainer, xbt_dynar_length(currentContainer)-1); + container_t father = currentContainer.back(); double bandwidth_value = link->bandwidth; double latency_value = link->latency; - xbt_dynar_t links_to_create = xbt_dynar_new (sizeof(char*), &xbt_free_ref); + std::vector links_to_create; 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); + 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{ - xbt_dynar_push_as (links_to_create, char*, strdup(link->id)); + links_to_create.push_back(link->id); } - char *link_name = NULL; - unsigned int i; - xbt_dynar_foreach (links_to_create, i, link_name){ - - container_t container = PJ_container_new (link_name, INSTR_LINK, father); + for (auto link_name: links_to_create){ + container_t container = PJ_container_new (link_name.c_str(), 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 == NULL){ - bandwidth = PJ_type_variable_new ("bandwidth", NULL, 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 == NULL){ - latency = PJ_type_variable_new ("latency", NULL, 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 == NULL){ + 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.name().c_str(), INSTR_HOST, father); if ((TRACE_categorized() || TRACE_uncategorized() || TRACE_platform()) && (! TRACE_disable_speed())) { type_t speed = PJ_type_get_or_null ("power", container->type); - if (speed == NULL){ - speed = PJ_type_variable_new ("power", NULL, container->type); + if (speed == nullptr){ + speed = PJ_type_variable_new ("power", nullptr, container->type); } - double current_speed_state; - xbt_dynar_get_cpy(host->speed_peak, host->pstate, ¤t_speed_state); + double current_speed_state = host.getPstateSpeedCurrent(); new_pajeSetVariable (0, container, speed, current_speed_state); } if (TRACE_uncategorized()){ type_t speed_used = PJ_type_get_or_null ("power_used", container->type); - if (speed_used == NULL){ + if (speed_used == nullptr){ PJ_type_variable_new ("power_used", "0.5 0.5 0.5", container->type); } } if (TRACE_smpi_is_enabled() && TRACE_smpi_is_grouped()){ type_t mpi = PJ_type_get_or_null ("MPI", container->type); - if (mpi == NULL){ + if (mpi == nullptr){ mpi = PJ_type_container_new("MPI", container->type); PJ_type_state_new ("MPI_STATE", mpi); - PJ_type_link_new ("MPI_LINK", PJ_type_get_root(), mpi, mpi); } } if (TRACE_msg_process_is_enabled()) { type_t msg_process = PJ_type_get_or_null ("MSG_PROCESS", container->type); - if (msg_process == NULL){ + 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); @@ -305,7 +292,7 @@ void sg_instr_new_host(sg_platf_host_cbarg_t host) if (TRACE_msg_vm_is_enabled()) { type_t msg_vm = PJ_type_get_or_null ("MSG_VM", container->type); - if (msg_vm == NULL){ + 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); @@ -322,14 +309,13 @@ 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 = NULL; + 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); @@ -369,7 +355,7 @@ static void recursiveNewVariableType (const char *new_typename, const char *colo snprintf (tnstr, INSTR_DEFAULT_STR_SIZE, "b%s", new_typename); PJ_type_variable_new (tnstr, color, root); } - xbt_dict_cursor_t cursor = NULL; + xbt_dict_cursor_t cursor = nullptr; type_t child_type; char *name; xbt_dict_foreach(root->children, cursor, name, child_type) { @@ -387,7 +373,7 @@ static void recursiveNewUserVariableType (const char *father_type, const char *n if (!strcmp (root->name, father_type)){ PJ_type_variable_new (new_typename, color, root); } - xbt_dict_cursor_t cursor = NULL; + xbt_dict_cursor_t cursor = nullptr; type_t child_type; char *name; xbt_dict_foreach(root->children, cursor, name, child_type) { @@ -405,7 +391,7 @@ static void recursiveNewUserStateType (const char *father_type, const char *new_ if (!strcmp (root->name, father_type)){ PJ_type_state_new (new_typename, root); } - xbt_dict_cursor_t cursor = NULL; + xbt_dict_cursor_t cursor = nullptr; type_t child_type; char *name; xbt_dict_foreach(root->children, cursor, name, child_type) { @@ -423,7 +409,7 @@ static void recursiveNewValueForUserStateType (const char *type_name, const char if (!strcmp (root->name, type_name)){ PJ_value_new (value, color, root); } - xbt_dict_cursor_t cursor = NULL; + xbt_dict_cursor_t cursor = nullptr; type_t child_type; char *name; xbt_dict_foreach(root->children, cursor, name, child_type) { @@ -443,12 +429,11 @@ 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) { if (!xbt_dict_is_empty(as->children())){ - xbt_dict_cursor_t cursor = NULL; + xbt_dict_cursor_t cursor = nullptr; AS_t as_child; char *child_name; //bottom-up recursion @@ -459,14 +444,14 @@ static void recursiveXBTGraphExtraction (xbt_graph_t graph, xbt_dict_t nodes, xb } } - as->getGraph(graph, nodes, edges); + static_cast(as)->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, NULL); - xbt_dict_t nodes = xbt_dict_new_homogeneous(NULL); - xbt_dict_t edges = xbt_dict_new_homogeneous(NULL); + 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()); xbt_dict_free (&nodes); xbt_dict_free (&edges); @@ -476,9 +461,9 @@ xbt_graph_t instr_routing_platform_graph (void) void instr_routing_platform_graph_export_graphviz (xbt_graph_t g, const char *filename) { unsigned int cursor = 0; - xbt_node_t node = NULL; - xbt_edge_t edge = NULL; - FILE *file = NULL; + xbt_node_t node = nullptr; + xbt_edge_t edge = nullptr; + FILE *file = nullptr; file = fopen(filename, "w"); xbt_assert(file, "Failed to open %s \n", filename);