From e539420254a37bebe33ac9258c633d2dbe39b1ad Mon Sep 17 00:00:00 2001 From: Jonathan Rouzaud-Cornabas Date: Thu, 14 Feb 2013 13:01:56 +0100 Subject: [PATCH] Remove commented code from surf_routing_cluster --- src/surf/surf_routing_cluster.c | 98 --------------------------------- 1 file changed, 98 deletions(-) diff --git a/src/surf/surf_routing_cluster.c b/src/surf/surf_routing_cluster.c index ab45c3f4bb..a054bba9e2 100644 --- a/src/surf/surf_routing_cluster.c +++ b/src/surf/surf_routing_cluster.c @@ -123,104 +123,6 @@ static void cluster_get_graph(xbt_graph_t graph, xbt_dict_t nodes, } } } - -/* - 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) -- 2.20.1