From: Jonathan Rouzaud-Cornabas Date: Thu, 14 Feb 2013 12:03:05 +0000 (+0100) Subject: Remove commented code from surf_routing_cluster X-Git-Tag: v3_9_90~491^2~33 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/59823017c3f9f3dba0ef09292bb55ed9ab906254 Remove commented code from surf_routing_cluster --- 59823017c3f9f3dba0ef09292bb55ed9ab906254 diff --cc src/surf/surf_routing_cluster.c index a054bba9e2,f2d468a643..dc7fdbd415 --- a/src/surf/surf_routing_cluster.c +++ b/src/surf/surf_routing_cluster.c @@@ -87,42 -87,138 +87,41 @@@ static void cluster_get_graph(xbt_graph } for (isrc = 0; isrc < table_size; isrc++) { - src = xbt_dynar_get_as(rc->index_network_elm, isrc, sg_routing_edge_t); + src = xbt_dynar_get_as(rc->index_network_elm, isrc, sg_routing_edge_t); - if (src->rc_type != SURF_NETWORK_ELEMENT_ROUTER) { - previous = new_xbt_graph_node(graph, src->name, nodes); + if (src->rc_type != SURF_NETWORK_ELEMENT_ROUTER) { + previous = new_xbt_graph_node(graph, src->name, nodes); - info = xbt_dynar_get_as(rc->link_up_down_list, src->id, - s_surf_parsing_link_up_down_t); + info = xbt_dynar_get_as(rc->link_up_down_list, src->id, + s_surf_parsing_link_up_down_t); - if (info.link_up) { // link up + if (info.link_up) { // link up - char *link_name = ((surf_resource_t) info.link_up)->name; - current = new_xbt_graph_node(graph, link_name, nodes); - new_xbt_graph_edge(graph, previous, current, edges); + char *link_name = ((surf_resource_t) info.link_up)->name; + current = new_xbt_graph_node(graph, link_name, nodes); + new_xbt_graph_edge(graph, previous, current, edges); - if (((as_cluster_t) rc)->backbone) { - new_xbt_graph_edge(graph, current, backboneNode, edges); - } else { - new_xbt_graph_edge(graph, current, routerNode, edges); - } + if (((as_cluster_t) rc)->backbone) { + new_xbt_graph_edge(graph, current, backboneNode, edges); + } else { + new_xbt_graph_edge(graph, current, routerNode, edges); + } - } + } - if (info.link_down) { // link down - char *link_name = ((surf_resource_t) info.link_down)->name; - current = new_xbt_graph_node(graph, link_name, nodes); - new_xbt_graph_edge(graph, previous, current, edges); + if (info.link_down) { // link down + char *link_name = ((surf_resource_t) info.link_down)->name; + current = new_xbt_graph_node(graph, link_name, nodes); + new_xbt_graph_edge(graph, previous, current, edges); - if (((as_cluster_t) rc)->backbone) { - new_xbt_graph_edge(graph, current, backboneNode, edges); - } else { - new_xbt_graph_edge(graph, current, routerNode, edges); - } - - } - } + if (((as_cluster_t) rc)->backbone) { + new_xbt_graph_edge(graph, current, backboneNode, edges); + } else { + new_xbt_graph_edge(graph, current, routerNode, edges); + } - - } -/* - if (((as_cluster_t) rc)->backbone) { - char *link_name = - ((surf_resource_t) ((as_cluster_t) rc)->backbone)->name; - - current = new_xbt_graph_node(graph, link_name, nodes); - new_xbt_graph_edge(graph, previous, current, edges); - previous = current; - - revCurrent = new_xbt_graph_node(graph, link_name, nodes); - new_xbt_graph_edge(graph, revCurrent, revPrevious, edges); - revPrevious = revCurrent; - } else { - info = xbt_dynar_get_as(rc->link_up_down_list, dst->id, - s_surf_parsing_link_up_down_t); - - if (info.link_up) { // link up - char *link_name = ((surf_resource_t) info.link_up)->name; - current = new_xbt_graph_node(graph, link_name, nodes); - new_xbt_graph_edge(graph, previous, current, edges); - previous = current; - } else if (info.link_down) { // link down - char *link_name = ((surf_resource_t) info.link_down)->name; - revCurrent = new_xbt_graph_node(graph, link_name, nodes); - new_xbt_graph_edge(graph, revCurrent, revPrevious, edges); - revPrevious = revCurrent; - } - } -*/ + } } -/* - if(rc->) - for (isrc = 0; isrc < table_size; isrc++) { - src = xbt_dynar_get_as(rc->index_network_elm, isrc, sg_routing_edge_t); - - previous = new_xbt_graph_node(graph, src->name, nodes); - revPrevious = new_xbt_graph_node(graph, src->name, nodes); - - for (idst = isrc + 1; idst < table_size; idst++) { - dst = xbt_dynar_get_as(rc->index_network_elm, idst, sg_routing_edge_t); - - s_surf_parsing_link_up_down_t info; - - if (src->rc_type != SURF_NETWORK_ELEMENT_ROUTER) { // No specific link for router - info = - xbt_dynar_get_as(rc->link_up_down_list, src->id, - s_surf_parsing_link_up_down_t); - - if (info.link_up) { // link up - char *link_name = ((surf_resource_t) info.link_up)->name; - current = new_xbt_graph_node(graph, link_name, nodes); - new_xbt_graph_edge(graph, previous, current, edges); - previous = current; - } else if (info.link_down) { // link down - char *link_name = ((surf_resource_t) info.link_down)->name; - revCurrent = new_xbt_graph_node(graph, link_name, nodes); - new_xbt_graph_edge(graph, revCurrent, revPrevious, edges); - revPrevious = revCurrent; - } - } - + - - if (((as_cluster_t) rc)->backbone) { - char *link_name = - ((surf_resource_t) ((as_cluster_t) rc)->backbone)->name; - - current = new_xbt_graph_node(graph, link_name, nodes); - new_xbt_graph_edge(graph, previous, current, edges); - previous = current; - - revCurrent = new_xbt_graph_node(graph, link_name, nodes); - new_xbt_graph_edge(graph, revCurrent, revPrevious, edges); - revPrevious = revCurrent; - } - - if (dst->rc_type != SURF_NETWORK_ELEMENT_ROUTER) { // No specific link for router - info = - xbt_dynar_get_as(rc->link_up_down_list, dst->id, - s_surf_parsing_link_up_down_t); - - if (info.link_up) { // link up - char *link_name = ((surf_resource_t) info.link_up)->name; - current = new_xbt_graph_node(graph, link_name, nodes); - new_xbt_graph_edge(graph, previous, current, edges); - previous = current; - } else if (info.link_down) { // link down - char *link_name = ((surf_resource_t) info.link_down)->name; - revCurrent = new_xbt_graph_node(graph, link_name, nodes); - new_xbt_graph_edge(graph, revCurrent, revPrevious, edges); - revPrevious = revCurrent; - } - } - - } - } -*/ } static void model_cluster_finalize(AS_t as)