X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/642bd255bc2ae9195c956807f6061246f6cb0f65..1c6ecd7825422241dd932318a4ba03c3df1de985:/src/instr/instr_routing.c diff --git a/src/instr/instr_routing.c b/src/instr/instr_routing.c index 9ac2f97035..2a1dc65ffc 100644 --- a/src/instr/instr_routing.c +++ b/src/instr/instr_routing.c @@ -9,6 +9,7 @@ #ifdef HAVE_TRACING #include "surf/surf_private.h" #include "surf/network_private.h" +#include "xbt/graph.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_routing, instr, "Tracing platform hierarchy"); @@ -62,8 +63,8 @@ static void linkContainers (container_t father, container_t src, container_t dst if (xbt_dict_get_or_null (filter, aux2)) return; //ok, not found, register it - xbt_dict_set (filter, aux1, xbt_strdup ("1"), xbt_free); - xbt_dict_set (filter, aux2, xbt_strdup ("1"), xbt_free); + xbt_dict_set (filter, aux1, xbt_strdup ("1"), NULL); + xbt_dict_set (filter, aux2, xbt_strdup ("1"), NULL); } //declare type @@ -72,7 +73,7 @@ static void linkContainers (container_t father, container_t src, container_t dst type_t link_type = getLinkType (link_typename, father->type, src->type, dst->type); //register EDGE types for triva configuration - xbt_dict_set (trivaEdgeTypes, link_type->name, xbt_strdup("1"), xbt_free); + xbt_dict_set (trivaEdgeTypes, link_type->name, xbt_strdup("1"), NULL); //create the link static long long counter = 0; @@ -82,11 +83,11 @@ static void linkContainers (container_t father, container_t src, container_t dst new_pajeEndLink(SIMIX_get_clock(), father, link_type, dst, "G", key); } -static void recursiveGraphExtraction (routing_component_t rc, container_t container, xbt_dict_t filter) +static void recursiveGraphExtraction (AS_t rc, container_t container, xbt_dict_t filter) { - if (xbt_dict_length (rc->routing_sons)){ + if (!xbt_dict_is_empty(rc->routing_sons)){ xbt_dict_cursor_t cursor = NULL; - routing_component_t rc_son; + AS_t rc_son; char *child_name; //bottom-up recursion xbt_dict_foreach(rc->routing_sons, cursor, child_name, rc_son) { @@ -108,12 +109,24 @@ static void recursiveGraphExtraction (routing_component_t rc, container_t contai (child2->kind == INSTR_HOST || child2->kind == INSTR_ROUTER) && strcmp (child1_name, child2_name) != 0){ - xbt_dynar_t route = global_routing->get_route (child1_name, child2_name); - unsigned int cpt; - void *link; + xbt_dynar_t route = NULL; + xbt_ex_t e; + + TRY { + routing_get_route_and_latency(child1_name, child2_name, &route, NULL); + } CATCH(e) { + xbt_ex_free(e); + } + if (route == NULL) continue; + + if (TRACE_onelink_only()){ + if (xbt_dynar_length (route) > 1) continue; + } container_t previous = child1; - xbt_dynar_foreach (route, cpt, link) { - char *link_name = ((link_CM02_t)link)->lmm_resource.generic_resource.name; + int i; + for (i = 0; i < xbt_dynar_length(route); i++){ + link_CM02_t *link = ((link_CM02_t*)xbt_dynar_get_ptr (route, i)); + char *link_name = (*link)->lmm_resource.generic_resource.name; container_t current = getContainerByName(link_name); linkContainers(container, previous, current, filter); previous = current; @@ -124,11 +137,13 @@ static void recursiveGraphExtraction (routing_component_t rc, container_t contai child2->kind == INSTR_AS && strcmp(child1_name, child2_name) != 0){ - route_extended_t route = rc->get_route (rc, child1_name, child2_name); + route_t route = xbt_new0(s_route_t,1); + route->link_list = xbt_dynar_new(global_routing->size_of_link,NULL); + rc->get_route_and_latency (rc, child1_name, child2_name, route,NULL); unsigned int cpt; void *link; container_t previous = getContainerByName(route->src_gateway); - xbt_dynar_foreach (route->generic_route.link_list, cpt, link) { + xbt_dynar_foreach (route->link_list, cpt, link) { char *link_name = ((link_CM02_t)link)->lmm_resource.generic_resource.name; container_t current = getContainerByName(link_name); linkContainers (container, previous, current, filter); @@ -136,6 +151,7 @@ static void recursiveGraphExtraction (routing_component_t rc, container_t contai } container_t last = getContainerByName(route->dst_gateway); linkContainers (container, previous, last, filter); + generic_free_route(route); } } } @@ -144,56 +160,58 @@ static void recursiveGraphExtraction (routing_component_t rc, container_t contai /* * Callbacks */ -static void instr_routing_parse_start_AS () +static void instr_routing_parse_start_AS (const char*id,const char*routing) { if (getRootContainer() == NULL){ - container_t root = newContainer (A_surfxml_AS_id, INSTR_AS, NULL); + container_t root = newContainer (id, INSTR_AS, NULL); instr_paje_init (root); - currentContainer = xbt_dynar_new (sizeof(container_t), NULL); - xbt_dynar_push (currentContainer, &root); - if (TRACE_smpi_is_enabled()) { if (!TRACE_smpi_is_grouped()){ - container_t father = *(container_t*)xbt_dynar_get_ptr(currentContainer, xbt_dynar_length(currentContainer)-1); - type_t mpi = getContainerType("MPI", father->type); + type_t mpi = getContainerType("MPI", root->type); getStateType ("MPI_STATE", mpi); getLinkType ("MPI_LINK", getRootType(), mpi, mpi); } } + if (TRACE_needs_platform()){ + currentContainer = xbt_dynar_new (sizeof(container_t), NULL); + xbt_dynar_push (currentContainer, &root); + } return; } - container_t father = *(container_t*)xbt_dynar_get_ptr(currentContainer, xbt_dynar_length(currentContainer)-1); - container_t new = newContainer (A_surfxml_AS_id, INSTR_AS, father); - //push - xbt_dynar_push (currentContainer, &new); + if (TRACE_needs_platform()){ + container_t father = *(container_t*)xbt_dynar_get_ptr(currentContainer, xbt_dynar_length(currentContainer)-1); + container_t new = newContainer (id, INSTR_AS, father); + xbt_dynar_push (currentContainer, &new); + } } static void instr_routing_parse_end_AS () { - xbt_dynar_pop_ptr (currentContainer); + if (TRACE_needs_platform()){ + xbt_dynar_pop_ptr (currentContainer); + } } -static void instr_routing_parse_start_link () +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); - const char *link_id = A_surfxml_link_id; - double bandwidth_value = atof(A_surfxml_link_bandwidth); - double latency_value = atof(A_surfxml_link_latency); + 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 (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_FULLDUPLEX){ - char *up = bprintf("%s_UP", link_id); - char *down = bprintf("%s_DOWN", link_id); + 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)); + xbt_dynar_push_as (links_to_create, char*, strdup(link->id)); } char *link_name = NULL; @@ -202,10 +220,12 @@ static void instr_routing_parse_start_link () container_t new = newContainer (link_name, INSTR_LINK, father); - type_t bandwidth = getVariableType ("bandwidth", NULL, new->type); - type_t latency = getVariableType ("latency", NULL, new->type); - new_pajeSetVariable (0, new, bandwidth, bandwidth_value); - new_pajeSetVariable (0, new, latency, latency_value); + if (TRACE_categorized() || TRACE_uncategorized()){ + type_t bandwidth = getVariableType ("bandwidth", NULL, new->type); + type_t latency = getVariableType ("latency", NULL, new->type); + new_pajeSetVariable (0, new, bandwidth, bandwidth_value); + new_pajeSetVariable (0, new, latency, latency_value); + } if (TRACE_uncategorized()){ getVariableType ("bandwidth_used", "0.5 0.5 0.5", new->type); } @@ -214,27 +234,23 @@ static void instr_routing_parse_start_link () xbt_dynar_free (&links_to_create); } -static void instr_routing_parse_end_link () -{ -} - -static void instr_routing_parse_start_host () +static void instr_routing_parse_start_host (sg_platf_host_cbarg_t host) { container_t father = *(container_t*)xbt_dynar_get_ptr(currentContainer, xbt_dynar_length(currentContainer)-1); - container_t new = newContainer (A_surfxml_host_id, INSTR_HOST, father); + container_t new = newContainer (host->id, INSTR_HOST, father); - type_t power = getVariableType ("power", NULL, new->type); - new_pajeSetVariable (0, new, power, atof(A_surfxml_host_power)); + if (TRACE_categorized() || TRACE_uncategorized()) { + type_t power = getVariableType ("power", NULL, new->type); + new_pajeSetVariable (0, new, power, host->power_peak); + } if (TRACE_uncategorized()){ getVariableType ("power_used", "0.5 0.5 0.5", new->type); } - if (TRACE_smpi_is_enabled()) { - if (TRACE_smpi_is_grouped()){ - type_t mpi = getContainerType("MPI", new->type); - getStateType ("MPI_STATE", mpi); - getLinkType ("MPI_LINK", getRootType(), mpi, mpi); - } + if (TRACE_smpi_is_enabled() && TRACE_smpi_is_grouped()){ + type_t mpi = getContainerType("MPI", new->type); + getStateType ("MPI_STATE", mpi); + getLinkType ("MPI_LINK", getRootType(), mpi, mpi); } if (TRACE_msg_process_is_enabled()) { @@ -259,25 +275,17 @@ static void instr_routing_parse_start_host () } } -static void instr_routing_parse_end_host () -{ -} - -static void instr_routing_parse_start_router () +static void instr_routing_parse_start_router (sg_platf_router_cbarg_t router) { container_t father = *(container_t*)xbt_dynar_get_ptr(currentContainer, xbt_dynar_length(currentContainer)-1); - newContainer (A_surfxml_router_id, INSTR_ROUTER, father); -} - -static void instr_routing_parse_end_router () -{ + newContainer (router->id, INSTR_ROUTER, father); } static void instr_routing_parse_end_platform () { xbt_dynar_free(¤tContainer); currentContainer = NULL; - xbt_dict_t filter = xbt_dict_new (); + xbt_dict_t filter = xbt_dict_new_homogeneous(xbt_free); recursiveGraphExtraction (global_routing->root, getRootContainer(), filter); xbt_dict_free(&filter); platform_created = 1; @@ -286,23 +294,23 @@ static void instr_routing_parse_end_platform () void instr_routing_define_callbacks () { - if (!TRACE_is_active()) - return; - surfxml_add_callback(STag_surfxml_AS_cb_list, &instr_routing_parse_start_AS); - surfxml_add_callback(ETag_surfxml_AS_cb_list, &instr_routing_parse_end_AS); - surfxml_add_callback(STag_surfxml_link_cb_list, &instr_routing_parse_start_link); - surfxml_add_callback(ETag_surfxml_link_cb_list, &instr_routing_parse_end_link); - surfxml_add_callback(STag_surfxml_host_cb_list, &instr_routing_parse_start_host); - surfxml_add_callback(ETag_surfxml_host_cb_list, &instr_routing_parse_end_host); - surfxml_add_callback(STag_surfxml_router_cb_list, &instr_routing_parse_start_router); - surfxml_add_callback(ETag_surfxml_router_cb_list, &instr_routing_parse_end_router); - surfxml_add_callback(ETag_surfxml_platform_cb_list, &instr_routing_parse_end_platform); + 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 + sg_platf_AS_begin_add_cb(instr_routing_parse_start_AS); + sg_platf_AS_end_add_cb(instr_routing_parse_end_AS); + if (!TRACE_needs_platform()) return; + sg_platf_link_add_cb(instr_routing_parse_start_link); + sg_platf_host_add_cb(instr_routing_parse_start_host); + sg_platf_router_add_cb(instr_routing_parse_start_router); + + sg_platf_postparse_add_cb(instr_routing_parse_end_platform); } /* * user categories support */ -static void recursiveNewUserVariableType (const char *new_typename, const char *color, type_t root) +static void recursiveNewVariableType (const char *new_typename, const char *color, type_t root) { if (!strcmp (root->name, "HOST")){ char tnstr[INSTR_DEFAULT_STR_SIZE]; @@ -318,51 +326,34 @@ static void recursiveNewUserVariableType (const char *new_typename, const char * type_t child_type; char *name; xbt_dict_foreach(root->children, cursor, name, child_type) { - recursiveNewUserVariableType (new_typename, color, child_type); + recursiveNewVariableType (new_typename, color, child_type); } } -void instr_new_user_variable_type (const char *new_typename, const char *color) +void instr_new_variable_type (const char *new_typename, const char *color) { - recursiveNewUserVariableType (new_typename, color, getRootType()); + recursiveNewVariableType (new_typename, color, getRootType()); } -static void recursiveNewUserLinkVariableType (const char *new_typename, const char *color, type_t root) +static void recursiveNewUserVariableType (const char *father_type, const char *new_typename, const char *color, type_t root) { - if (!strcmp (root->name, "LINK")){ + if (!strcmp (root->name, father_type)){ getVariableType(new_typename, color, root); } xbt_dict_cursor_t cursor = NULL; type_t child_type; char *name; xbt_dict_foreach(root->children, cursor, name, child_type) { - recursiveNewUserLinkVariableType (new_typename, color, child_type); + recursiveNewUserVariableType (father_type, new_typename, color, child_type); } } -void instr_new_user_link_variable_type (const char *new_typename, const char *color) +void instr_new_user_variable_type (const char *father_type, const char *new_typename, const char *color) { - recursiveNewUserLinkVariableType (new_typename, color, getRootType()); + recursiveNewUserVariableType (father_type, new_typename, color, getRootType()); } -static void recursiveNewUserHostVariableType (const char *new_typename, const char *color, type_t root) -{ - if (!strcmp (root->name, "HOST")){ - getVariableType(new_typename, color, root); - } - xbt_dict_cursor_t cursor = NULL; - type_t child_type; - char *name; - xbt_dict_foreach(root->children, cursor, name, child_type) { - recursiveNewUserHostVariableType (new_typename, color, child_type); - } -} - -void instr_new_user_host_variable_type (const char *new_typename, const char *color) -{ - recursiveNewUserHostVariableType (new_typename, color, getRootType()); -} int instr_platform_traced () { @@ -404,11 +395,11 @@ static xbt_edge_t new_xbt_graph_edge (xbt_graph_t graph, xbt_node_t s, xbt_node_ } static void recursiveXBTGraphExtraction (xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges, - routing_component_t rc, container_t container) + AS_t rc, container_t container) { - if (xbt_dict_length (rc->routing_sons)){ + if (!xbt_dict_is_empty(rc->routing_sons)){ xbt_dict_cursor_t cursor = NULL; - routing_component_t rc_son; + AS_t rc_son; char *child_name; //bottom-up recursion xbt_dict_foreach(rc->routing_sons, cursor, child_name, rc_son) { @@ -430,7 +421,12 @@ static void recursiveXBTGraphExtraction (xbt_graph_t graph, xbt_dict_t nodes, xb (child2->kind == INSTR_HOST || child2->kind == INSTR_ROUTER) && strcmp (child1_name, child2_name) != 0){ - xbt_dynar_t route = global_routing->get_route (child1_name, child2_name); + // FIXME factorize route creation with else branch below (once possible) + xbt_dynar_t route=NULL; + routing_get_route_and_latency (child1_name, child2_name,&route,NULL); + if (TRACE_onelink_only()){ + if (xbt_dynar_length (route) > 1) continue; + } unsigned int cpt; void *link; xbt_node_t current, previous = new_xbt_graph_node(graph, child1_name, nodes); @@ -448,11 +444,13 @@ static void recursiveXBTGraphExtraction (xbt_graph_t graph, xbt_dict_t nodes, xb child2->kind == INSTR_AS && strcmp(child1_name, child2_name) != 0){ - route_extended_t route = rc->get_route (rc, child1_name, child2_name); + route_t route = xbt_new0(s_route_t,1); + route->link_list = xbt_dynar_new(global_routing->size_of_link,NULL); + rc->get_route_and_latency (rc, child1_name, child2_name,route, NULL); unsigned int cpt; void *link; xbt_node_t current, previous = new_xbt_graph_node(graph, route->src_gateway, nodes); - xbt_dynar_foreach (route->generic_route.link_list, cpt, link) { + xbt_dynar_foreach (route->link_list, cpt, link) { char *link_name = ((link_CM02_t)link)->lmm_resource.generic_resource.name; current = new_xbt_graph_node(graph, link_name, nodes); //previous -> current @@ -460,6 +458,7 @@ static void recursiveXBTGraphExtraction (xbt_graph_t graph, xbt_dict_t nodes, xb } current = new_xbt_graph_node(graph, route->dst_gateway, nodes); new_xbt_graph_edge (graph, previous, current, edges); + generic_free_route(route); } } } @@ -469,11 +468,48 @@ static void recursiveXBTGraphExtraction (xbt_graph_t graph, xbt_dict_t nodes, xb xbt_graph_t instr_routing_platform_graph (void) { xbt_graph_t ret = xbt_graph_new_graph (0, NULL); - xbt_dict_t nodes = xbt_dict_new (); - xbt_dict_t edges = xbt_dict_new (); + xbt_dict_t nodes = xbt_dict_new_homogeneous(NULL); + xbt_dict_t edges = xbt_dict_new_homogeneous(NULL); recursiveXBTGraphExtraction (ret, nodes, edges, global_routing->root, getRootContainer()); return ret; } +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; + + 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", TRACE_node_name(node)); + } + xbt_dynar_foreach(g->edges, cursor, edge) { + const char *src_s = TRACE_node_name (edge->src); + const char *dst_s = TRACE_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); + +} + #endif /* HAVE_TRACING */