X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a7732fdf6a3ad939561c0681fc74b35194c1e154..40dffe1f6c370e36f3e20ad82539e69b25cdcecd:/src/surf/surf_routing_generic.c diff --git a/src/surf/surf_routing_generic.c b/src/surf/surf_routing_generic.c index a6501cb401..38cc16d09e 100644 --- a/src/surf/surf_routing_generic.c +++ b/src/surf/surf_routing_generic.c @@ -14,103 +14,84 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_routing_generic, surf_route, "Generic implementation of the surf routing"); -AS_t routmod_generic_create(size_t childsize) { - AS_t new_component = xbt_malloc0(childsize); +static int no_bypassroute_declared = 1; + +AS_t model_generic_create_sized(size_t childsize) { + AS_t new_component = model_none_create_sized(childsize); new_component->parse_PU = generic_parse_PU; new_component->parse_AS = generic_parse_AS; new_component->parse_route = NULL; new_component->parse_ASroute = NULL; new_component->parse_bypassroute = generic_parse_bypassroute; - new_component->get_route = NULL; - new_component->get_latency = generic_get_link_latency; + new_component->get_route_and_latency = NULL; new_component->get_onelink_routes = NULL; new_component->get_bypass_route = generic_get_bypassroute; - new_component->finalize = NULL; - new_component->to_index = xbt_dict_new(); - new_component->bypassRoutes = xbt_dict_new(); + new_component->finalize = model_generic_finalize; + new_component->bypassRoutes = xbt_dict_new_homogeneous((void (*)(void *)) generic_free_route); return new_component; } +void model_generic_finalize(AS_t as) { + xbt_dict_free(&as->bypassRoutes); + model_none_finalize(as); +} - -void generic_parse_PU(AS_t as, const char *name) +int generic_parse_PU(AS_t as, network_element_t elm) { - XBT_DEBUG("Load process unit \"%s\"", name); - int *id = xbt_new0(int, 1); - xbt_dict_t _to_index; - _to_index = as->to_index; - *id = xbt_dict_length(_to_index); - xbt_dict_set(_to_index, name, id, xbt_free); + XBT_DEBUG("Load process unit \"%s\"", elm->name); + xbt_dynar_push_as(as->index_network_elm,network_element_t,elm); + return xbt_dynar_length(as->index_network_elm)-1; } -void generic_parse_AS(AS_t as, const char *name) +int generic_parse_AS(AS_t as, network_element_t elm) { - XBT_DEBUG("Load Autonomous system \"%s\"", name); - int *id = xbt_new0(int, 1); - xbt_dict_t _to_index; - _to_index = as->to_index; - *id = xbt_dict_length(_to_index); - xbt_dict_set(_to_index, name, id, xbt_free); + XBT_DEBUG("Load Autonomous system \"%s\"", elm->name); + xbt_dynar_push_as(as->index_network_elm,network_element_t,elm); + return xbt_dynar_length(as->index_network_elm)-1; } void generic_parse_bypassroute(AS_t rc, const char *src, const char *dst, - route_extended_t e_route) + route_t e_route) { XBT_DEBUG("Load bypassRoute from \"%s\" to \"%s\"", src, dst); xbt_dict_t dict_bypassRoutes = rc->bypassRoutes; char *route_name; route_name = bprintf("%s#%s", src, dst); - xbt_assert(xbt_dynar_length(e_route->generic_route.link_list) > 0, + xbt_assert(!xbt_dynar_is_empty(e_route->link_list), "Invalid count of links, must be greater than zero (%s,%s)", src, dst); xbt_assert(!xbt_dict_get_or_null(dict_bypassRoutes, route_name), "The bypass route between \"%s\"(\"%s\") and \"%s\"(\"%s\") already exists", - src, e_route->src_gateway, dst, e_route->dst_gateway); + src, e_route->src_gateway->name, dst, e_route->dst_gateway->name); - route_extended_t new_e_route = + route_t new_e_route = generic_new_extended_route(SURF_ROUTING_RECURSIVE, e_route, 0); - xbt_dynar_free(&(e_route->generic_route.link_list)); + xbt_dynar_free(&(e_route->link_list)); xbt_free(e_route); - xbt_dict_set(dict_bypassRoutes, route_name, new_e_route, - (void (*)(void *)) generic_free_extended_route); + xbt_dict_set(dict_bypassRoutes, route_name, new_e_route, NULL); + no_bypassroute_declared = 0; xbt_free(route_name); } /* ************************************************************************** */ /* *********************** GENERIC BUSINESS METHODS ************************* */ -double generic_get_link_latency(AS_t rc, - const char *src, const char *dst, - route_extended_t route) -{ - int need_to_clean = route ? 0 : 1; - void *link; - unsigned int i; - double latency = 0.0; - - route = route ? route : rc->get_route(rc, src, dst); - - xbt_dynar_foreach(route->generic_route.link_list, i, link) { - latency += surf_network_model->extension.network.get_link_latency(link); - } - if (need_to_clean) - generic_free_extended_route(route); - return latency; -} - -xbt_dynar_t generic_get_onelink_routes(AS_t rc) -{ +xbt_dynar_t generic_get_onelink_routes(AS_t rc) { // FIXME: kill that stub xbt_die("\"generic_get_onelink_routes\" not implemented yet"); + return NULL; } -route_extended_t generic_get_bypassroute(AS_t rc, - const char *src, const char *dst) +route_t generic_get_bypassroute(AS_t rc, network_element_t src, network_element_t dst) { + // If never set a bypass route return NULL without any further computations + if(no_bypassroute_declared) + return NULL; + xbt_dict_t dict_bypassRoutes = rc->bypassRoutes; AS_t src_as, dst_as; int index_src, index_dst; @@ -120,20 +101,15 @@ route_extended_t generic_get_bypassroute(AS_t rc, AS_t *current_src = NULL; AS_t *current_dst = NULL; - /* (1) find the as where the src and dst are located */ - void *src_data = xbt_lib_get_or_null(host_lib, src, ROUTING_HOST_LEVEL); - void *dst_data = xbt_lib_get_or_null(host_lib, dst, ROUTING_HOST_LEVEL); - if (!src_data) - src_data = xbt_lib_get_or_null(as_router_lib, src, ROUTING_ASR_LEVEL); - if (!dst_data) - dst_data = xbt_lib_get_or_null(as_router_lib, dst, ROUTING_ASR_LEVEL); + char* src_name = src->name; + char* dst_name = dst->name; - if (src_data == NULL || dst_data == NULL) + if (src == NULL || dst == NULL) xbt_die("Ask for route \"from\"(%s) or \"to\"(%s) no found at AS \"%s\"", - src, dst, rc->name); + src_name, dst_name, rc->name); - src_as = ((network_element_info_t) src_data)->rc_component; - dst_as = ((network_element_info_t) dst_data)->rc_component; + src_as = src->rc_component; + dst_as = dst->rc_component; /* (2) find the path to the root routing component */ path_src = xbt_dynar_new(sizeof(AS_t), NULL); @@ -169,7 +145,7 @@ route_extended_t generic_get_bypassroute(AS_t rc, int max_index = max(max_index_src, max_index_dst); int i, max; - route_extended_t e_route_bypass = NULL; + route_t e_route_bypass = NULL; for (max = 0; max <= max_index; max++) { for (i = 0; i < max; i++) { @@ -216,18 +192,18 @@ route_extended_t generic_get_bypassroute(AS_t rc, xbt_dynar_free(&path_src); xbt_dynar_free(&path_dst); - route_extended_t new_e_route = NULL; + route_t new_e_route = NULL; if (e_route_bypass) { void *link; unsigned int cpt = 0; - new_e_route = xbt_new0(s_route_extended_t, 1); - new_e_route->src_gateway = xbt_strdup(e_route_bypass->src_gateway); - new_e_route->dst_gateway = xbt_strdup(e_route_bypass->dst_gateway); - new_e_route->generic_route.link_list = + new_e_route = xbt_new0(s_route_t, 1); + new_e_route->src_gateway = e_route_bypass->src_gateway; + new_e_route->dst_gateway = e_route_bypass->dst_gateway; + new_e_route->link_list = xbt_dynar_new(global_routing->size_of_link, NULL); - xbt_dynar_foreach(e_route_bypass->generic_route.link_list, cpt, link) { - xbt_dynar_push(new_e_route->generic_route.link_list, &link); + xbt_dynar_foreach(e_route_bypass->link_list, cpt, link) { + xbt_dynar_push(new_e_route->link_list, &link); } } @@ -272,22 +248,19 @@ generic_new_route(e_surf_routing_hierarchy_t hierarchy, void *data, int order) return new_route; } -route_extended_t +route_t generic_new_extended_route(e_surf_routing_hierarchy_t hierarchy, void *data, int order) { char *link_name; - route_extended_t e_route, new_e_route; + route_t e_route, new_e_route; route_t route; unsigned int cpt; xbt_dynar_t links = NULL, links_id = NULL; - new_e_route = xbt_new0(s_route_extended_t, 1); - new_e_route->generic_route.link_list = - xbt_dynar_new(global_routing->size_of_link, NULL); - new_e_route->src_gateway = NULL; - new_e_route->dst_gateway = NULL; + new_e_route = xbt_new0(s_route_t, 1); + new_e_route->link_list = xbt_dynar_new(global_routing->size_of_link, NULL); xbt_assert(hierarchy == SURF_ROUTING_BASE || hierarchy == SURF_ROUTING_RECURSIVE, @@ -300,17 +273,17 @@ generic_new_extended_route(e_surf_routing_hierarchy_t hierarchy, } else if (hierarchy == SURF_ROUTING_RECURSIVE) { - e_route = (route_extended_t) data; + e_route = (route_t) data; xbt_assert(e_route->src_gateway && e_route->dst_gateway, "bad gateway, is null"); - links = e_route->generic_route.link_list; + links = e_route->link_list; /* remeber not erase the gateway names */ - new_e_route->src_gateway = strdup(e_route->src_gateway); - new_e_route->dst_gateway = strdup(e_route->dst_gateway); + new_e_route->src_gateway = e_route->src_gateway; + new_e_route->dst_gateway = e_route->dst_gateway; } - links_id = new_e_route->generic_route.link_list; + links_id = new_e_route->link_list; xbt_dynar_foreach(links, cpt, link_name) { @@ -330,21 +303,11 @@ generic_new_extended_route(e_surf_routing_hierarchy_t hierarchy, void generic_free_route(route_t route) { if (route) { - xbt_dynar_free(&(route->link_list)); + xbt_dynar_free(&route->link_list); xbt_free(route); } } -void generic_free_extended_route(route_extended_t e_route) -{ - if (e_route) { - xbt_dynar_free(&(e_route->generic_route.link_list)); - xbt_free(e_route->src_gateway); - xbt_free(e_route->dst_gateway); - xbt_free(e_route); - } -} - static AS_t generic_as_exist(AS_t find_from, AS_t to_find) { @@ -371,7 +334,7 @@ generic_autonomous_system_exist(AS_t rc, char *element) AS_t element_as, result, elem; xbt_dict_cursor_t cursor = NULL; char *key; - element_as = ((network_element_info_t) + element_as = ((network_element_t) xbt_lib_get_or_null(as_router_lib, element, ROUTING_ASR_LEVEL))->rc_component; result = ((AS_t) - 1); @@ -395,7 +358,7 @@ AS_t generic_processing_units_exist(AS_t rc, char *element) { AS_t element_as; - element_as = ((network_element_info_t) + element_as = ((network_element_t) xbt_lib_get_or_null(host_lib, element, ROUTING_HOST_LEVEL))->rc_component; if (element_as == rc) @@ -403,31 +366,35 @@ generic_processing_units_exist(AS_t rc, char *element) return generic_as_exist(rc, element_as); } -void generic_src_dst_check(AS_t rc, const char *src, - const char *dst) +void generic_src_dst_check(AS_t rc, network_element_t src, + network_element_t dst) { - void *src_data = xbt_lib_get_or_null(host_lib, src, ROUTING_HOST_LEVEL); - void *dst_data = xbt_lib_get_or_null(host_lib, dst, ROUTING_HOST_LEVEL); - if (!src_data) - src_data = xbt_lib_get_or_null(as_router_lib, src, ROUTING_ASR_LEVEL); - if (!dst_data) - dst_data = xbt_lib_get_or_null(as_router_lib, dst, ROUTING_ASR_LEVEL); + network_element_t src_data = src; + network_element_t dst_data = dst; if (src_data == NULL || dst_data == NULL) xbt_die("Ask for route \"from\"(%s) or \"to\"(%s) no found at AS \"%s\"", - src, dst, rc->name); + src->name, + dst->name, + rc->name); AS_t src_as = - ((network_element_info_t) src_data)->rc_component; + (src_data)->rc_component; AS_t dst_as = - ((network_element_info_t) dst_data)->rc_component; + (dst_data)->rc_component; if (src_as != dst_as) xbt_die("The src(%s in %s) and dst(%s in %s) are in differents AS", - src, src_as->name, dst, dst_as->name); + src->name, src_as->name, + dst->name, dst_as->name); + if (rc != dst_as) xbt_die ("The routing component of src'%s' and dst'%s' is not the same as the network elements belong (%s?=%s?=%s)", - src, dst, src_as->name, dst_as->name, rc->name); + src->name, + dst->name, + src_as->name, + dst_as->name, + rc->name); }