X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/842d47ec767179801dcf5cf2beba708b92697dbf..346c06db41ebb088e88351d8381d0c232d2ddbb5:/src/instr/instr_routing.c diff --git a/src/instr/instr_routing.c b/src/instr/instr_routing.c index 70b4c2efb2..d2c91ee8bb 100644 --- a/src/instr/instr_routing.c +++ b/src/instr/instr_routing.c @@ -133,62 +133,52 @@ static void recursiveGraphExtraction (AS_t rc, container_t container, xbt_dict_t container_t child1, child2; const char *child1_name, *child2_name; xbt_dict_foreach(container->children, cursor1, child1_name, child1) { - if (child1->kind == INSTR_LINK) continue; - xbt_dict_foreach(container->children, cursor2, child2_name, child2) { - if (child2->kind == INSTR_LINK) continue; + //if child1 is not a link, a smpi node, a msg process or a msg task + if (child1->kind == INSTR_LINK || child1->kind == INSTR_SMPI || child1->kind == INSTR_MSG_PROCESS || child1->kind == INSTR_MSG_TASK) continue; - if ((child1->kind == INSTR_HOST || child1->kind == INSTR_ROUTER) && - (child2->kind == INSTR_HOST || child2->kind == INSTR_ROUTER) && - strcmp (child1_name, child2_name) != 0){ + xbt_dict_foreach(container->children, cursor2, child2_name, child2) { + //if child2 is not a link, a smpi node, a msg process or a msg task + if (child2->kind == INSTR_LINK || child2->kind == INSTR_SMPI || child2->kind == INSTR_MSG_PROCESS || child2->kind == INSTR_MSG_TASK) continue; - xbt_dynar_t route = NULL; - xbt_ex_t e; + //if child1 is not child2 + if (strcmp (child1_name, child2_name) == 0) continue; - TRY { - routing_get_route_and_latency((network_element_t)(child1->net_elm), - (network_element_t)(child2->net_elm), - &route, NULL); - } CATCH(e) { - xbt_ex_free(e); - } - if (route == NULL) continue; + //get the route + route_t route = xbt_new0(s_route_t,1); + route->link_list = xbt_dynar_new(sizeof(sg_routing_link_t),NULL); + rc->get_route_and_latency(rc, child1->net_elm, child2->net_elm, + route, NULL); - if (TRACE_onelink_only()){ - if (xbt_dynar_length (route) > 1) continue; - } - container_t previous = child1; - 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 = PJ_container_get(link_name); - linkContainers(previous, current, filter); - previous = current; - } - linkContainers(previous, child2, filter); - - }else if (child1->kind == INSTR_AS && - child2->kind == INSTR_AS && - strcmp(child1_name, child2_name) != 0){ - - 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, - (network_element_t)(child1->net_elm), - (network_element_t)(child2->net_elm), route,NULL); - unsigned int cpt; - void *link; - container_t previous = PJ_container_get(route->src_gateway->name); - xbt_dynar_foreach (route->link_list, cpt, link) { - char *link_name = ((link_CM02_t)link)->lmm_resource.generic_resource.name; - container_t current = PJ_container_get(link_name); - linkContainers (previous, current, filter); - previous = current; - } - container_t last = PJ_container_get(route->dst_gateway->name); - linkContainers (previous, last, filter); + //user might want to extract a graph using routes with only one link + //see --cfg=tracing/onelink_only:1 or --help-tracing for details + if (TRACE_onelink_only() && xbt_dynar_length (route->link_list) > 1){ generic_free_route(route); + continue; } + + //traverse the route connecting the containers + unsigned int cpt; + void *link; + container_t current, previous; + if (route->src_gateway){ + previous = PJ_container_get(route->src_gateway->name); + }else{ + previous = child1; + } + + xbt_dynar_foreach (route->link_list, cpt, link) { + char *link_name = ((link_CM02_t)link)->lmm_resource.generic_resource.name; + current = PJ_container_get(link_name); + linkContainers(previous, current, filter); + previous = current; + } + if (route->dst_gateway){ + current = PJ_container_get(route->dst_gateway->name); + }else{ + current = child2; + } + linkContainers(previous, current, filter); + generic_free_route(route); } } } @@ -261,7 +251,7 @@ static void instr_routing_parse_start_link (sg_platf_link_cbarg_t link) container_t new = PJ_container_new (link_name, INSTR_LINK, father); - if (TRACE_categorized() || TRACE_uncategorized()){ + if (TRACE_categorized() || TRACE_uncategorized() || TRACE_platform()){ type_t bandwidth = PJ_type_get_or_null ("bandwidth", new->type); if (bandwidth == NULL){ bandwidth = PJ_type_variable_new ("bandwidth", NULL, new->type); @@ -289,7 +279,7 @@ 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 = PJ_container_new (host->id, INSTR_HOST, father); - if (TRACE_categorized() || TRACE_uncategorized()) { + if (TRACE_categorized() || TRACE_uncategorized() || TRACE_platform()) { type_t power = PJ_type_get_or_null ("power", new->type); if (power == NULL){ power = PJ_type_variable_new ("power", NULL, new->type); @@ -317,7 +307,6 @@ static void instr_routing_parse_start_host (sg_platf_host_cbarg_t host) if (msg_process == NULL){ msg_process = PJ_type_container_new("MSG_PROCESS", new->type); type_t state = PJ_type_state_new ("MSG_PROCESS_STATE", msg_process); - PJ_value_new ("executing", "0 1 0", state); PJ_value_new ("suspend", "1 0 1", state); PJ_value_new ("sleep", "1 1 0", state); PJ_value_new ("receive", "1 0 0", state); @@ -340,7 +329,7 @@ static void instr_routing_parse_end_platform () xbt_dynar_free(¤tContainer); currentContainer = NULL; xbt_dict_t filter = xbt_dict_new_homogeneous(xbt_free); - recursiveGraphExtraction (global_routing->root, PJ_container_get_root(), filter); + recursiveGraphExtraction (routing_platf->root, PJ_container_get_root(), filter); xbt_dict_free(&filter); platform_created = 1; TRACE_paje_dump_buffer(1); @@ -471,58 +460,50 @@ static void recursiveXBTGraphExtraction (xbt_graph_t graph, xbt_dict_t nodes, xb container_t child1, child2; const char *child1_name, *child2_name; xbt_dict_foreach(container->children, cursor1, child1_name, child1) { - if (child1->kind == INSTR_LINK) continue; + //if child1 is not a link, a smpi node, a msg process or a msg task + if (child1->kind == INSTR_LINK || child1->kind == INSTR_SMPI || child1->kind == INSTR_MSG_PROCESS || child1->kind == INSTR_MSG_TASK) continue; + xbt_dict_foreach(container->children, cursor2, child2_name, child2) { - if (child2->kind == INSTR_LINK) continue; - - if ((child1->kind == INSTR_HOST || child1->kind == INSTR_ROUTER) && - (child2->kind == INSTR_HOST || child2->kind == INSTR_ROUTER) && - strcmp (child1_name, child2_name) != 0){ - - // FIXME factorize route creation with else branch below (once possible) - xbt_dynar_t route=NULL; - routing_get_route_and_latency ((network_element_t)(child1->net_elm), - (network_element_t)(child2->net_elm), - &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); - xbt_dynar_foreach (route, cpt, link) { - char *link_name = ((link_CM02_t)link)->lmm_resource.generic_resource.name; - current = new_xbt_graph_node(graph, link_name, nodes); - new_xbt_graph_edge (graph, previous, current, edges); - //previous -> current - previous = current; - } - current = new_xbt_graph_node(graph, child2_name, nodes); - new_xbt_graph_edge (graph, previous, current, edges); + //if child2 is not a link, a smpi node, a msg process or a msg task + if (child2->kind == INSTR_LINK || child2->kind == INSTR_SMPI || child2->kind == INSTR_MSG_PROCESS || child2->kind == INSTR_MSG_TASK) continue; + + //if child1 is not child2 + if (strcmp (child1_name, child2_name) == 0) continue; + + //get the route + route_t route = xbt_new0(s_route_t,1); + route->link_list = xbt_dynar_new(sizeof(sg_routing_link_t),NULL); + rc->get_route_and_latency(rc, child1->net_elm, child2->net_elm, + route, NULL); + + //user might want to extract a graph using routes with only one link + //see --cfg=tracing/onelink_only:1 or --help-tracing for details + if (TRACE_onelink_only() && xbt_dynar_length (route->link_list) > 1) continue; + + //traverse the route connecting the containers + unsigned int cpt; + void *link; + xbt_node_t current, previous; + if (route->src_gateway){ + previous = new_xbt_graph_node(graph, route->src_gateway->name, nodes); + }else{ + previous = new_xbt_graph_node(graph, child1_name, nodes); + } - }else if (child1->kind == INSTR_AS && - child2->kind == INSTR_AS && - strcmp(child1_name, child2_name) != 0){ - - 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, - (network_element_t)(child1->net_elm), - (network_element_t)(child2->net_elm),route, NULL); - unsigned int cpt; - void *link; - xbt_node_t current, previous = new_xbt_graph_node(graph, route->src_gateway->name, nodes); - 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); - new_xbt_graph_edge (graph, previous, current, edges); - //previous -> current - previous = current; - } - current = new_xbt_graph_node(graph, route->dst_gateway->name, nodes); + 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); new_xbt_graph_edge (graph, previous, current, edges); - generic_free_route(route); + //previous -> current + previous = current; + } + if (route->dst_gateway){ + current = new_xbt_graph_node(graph, route->dst_gateway->name, nodes); + }else{ + current = new_xbt_graph_node(graph, child2_name, nodes); } + new_xbt_graph_edge (graph, previous, current, edges); + generic_free_route(route); } } @@ -533,7 +514,7 @@ 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_homogeneous(NULL); xbt_dict_t edges = xbt_dict_new_homogeneous(NULL); - recursiveXBTGraphExtraction (ret, nodes, edges, global_routing->root, PJ_container_get_root()); + recursiveXBTGraphExtraction (ret, nodes, edges, routing_platf->root, PJ_container_get_root()); xbt_dict_free (&nodes); xbt_dict_free (&edges); return ret;