From f611b1b5219c8925907bc6288430d8b6f324e408 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Sun, 8 Apr 2012 15:16:46 -1000 Subject: [PATCH] [route parsing] reduce the amount of dupplicated code the generic_new_extended_route() can do the work of generic_new_route(), so kill the simple one and use the complete one instead. --- src/surf/surf_routing_generic.c | 36 +-------------------------------- src/surf/surf_routing_private.h | 3 --- 2 files changed, 1 insertion(+), 38 deletions(-) diff --git a/src/surf/surf_routing_generic.c b/src/surf/surf_routing_generic.c index f156fb7ba8..97dcbda658 100644 --- a/src/surf/surf_routing_generic.c +++ b/src/surf/surf_routing_generic.c @@ -75,7 +75,7 @@ void generic_parse_bypassroute(AS_t rc, if(e_route->dst_gateway) new_e_route = generic_new_extended_route(SURF_ROUTING_RECURSIVE, e_route, 1); else - new_e_route = generic_new_route(SURF_ROUTING_BASE, e_route, 1); + new_e_route = generic_new_extended_route(SURF_ROUTING_BASE, e_route, 1); xbt_dynar_free(&(e_route->link_list)); xbt_free(e_route); @@ -227,40 +227,6 @@ route_t generic_get_bypassroute(AS_t rc, network_element_t src, network_element_ /* ************************************************************************** */ /* ************************* GENERIC AUX FUNCTIONS ************************** */ - -route_t -generic_new_route(e_surf_routing_hierarchy_t hierarchy, route_t data, int order) -{ - - char *link_name; - route_t new_route; - unsigned int cpt; - xbt_dynar_t links = NULL, links_id = NULL; - - new_route = xbt_new0(s_route_t, 1); - new_route->link_list = xbt_dynar_new(global_routing->size_of_link, NULL); - - xbt_assert(hierarchy == SURF_ROUTING_BASE, - "the hierarchy type is not SURF_ROUTING_BASE"); - - links = ((route_t) data)->link_list; - links_id = new_route->link_list; - - xbt_dynar_foreach(links, cpt, link_name) { - - void *link = xbt_lib_get_or_null(link_lib, link_name, SURF_LINK_LEVEL); - if (link) { - if (order) - xbt_dynar_push(links_id, &link); - else - xbt_dynar_unshift(links_id, &link); - } else - THROWF(mismatch_error, 0, "Link %s not found", link_name); - } - - return new_route; -} - route_t generic_new_extended_route(e_surf_routing_hierarchy_t hierarchy, route_t data, int order) diff --git a/src/surf/surf_routing_private.h b/src/surf/surf_routing_private.h index ec9fe747a8..657e24fe46 100644 --- a/src/surf/surf_routing_private.h +++ b/src/surf/surf_routing_private.h @@ -49,9 +49,6 @@ route_t generic_get_bypassroute(AS_t rc, route_t generic_new_extended_route(e_surf_routing_hierarchy_t hierarchy, route_t data, int order); -route_t -generic_new_route(e_surf_routing_hierarchy_t hierarchy, - route_t data, int order); AS_t generic_autonomous_system_exist(AS_t rc, char *element); AS_t -- 2.20.1