X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/57c155c5ac08e57c81d145012425045a439b002b..d0c5e1a0a928d8bc285d5d48c6cdaa75d9c9b7ef:/src/surf/surf_routing_generic.c diff --git a/src/surf/surf_routing_generic.c b/src/surf/surf_routing_generic.c index e627a7b2ac..a45728659d 100644 --- a/src/surf/surf_routing_generic.c +++ b/src/surf/surf_routing_generic.c @@ -4,13 +4,12 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include /* regular expression library */ - #include "simgrid/platf_interface.h" // platform creation API internal interface #include "surf_routing_private.h" #include "surf/surf_routing.h" #include "surf/surfxml_parse_values.h" +#include "xbt/graph.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_routing_generic, surf_route, "Generic implementation of the surf routing"); @@ -38,25 +37,26 @@ void model_generic_finalize(AS_t as) { model_none_finalize(as); } -int generic_parse_PU(AS_t as, network_element_t elm) +int generic_parse_PU(AS_t as, sg_routing_edge_t elm) { XBT_DEBUG("Load process unit \"%s\"", elm->name); - xbt_dynar_push_as(as->index_network_elm,network_element_t,elm); + xbt_dynar_push_as(as->index_network_elm,sg_routing_edge_t,elm); return xbt_dynar_length(as->index_network_elm)-1; } -int generic_parse_AS(AS_t as, network_element_t elm) +int generic_parse_AS(AS_t as, sg_routing_edge_t elm) { XBT_DEBUG("Load Autonomous system \"%s\"", elm->name); - xbt_dynar_push_as(as->index_network_elm,network_element_t,elm); + xbt_dynar_push_as(as->index_network_elm,sg_routing_edge_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_t e_route) +void generic_parse_bypassroute(AS_t rc, sg_platf_route_cbarg_t e_route) { - if(e_route->dst_gateway) + char *src = (char*)(e_route->src); + char *dst = (char*)(e_route->dst); + + if(e_route->gw_dst) XBT_DEBUG("Load bypassASroute from \"%s\" to \"%s\"", src, dst); else XBT_DEBUG("Load bypassRoute from \"%s\" to \"%s\"", src, dst); @@ -65,20 +65,19 @@ void generic_parse_bypassroute(AS_t rc, route_name = bprintf("%s#%s", src, dst); xbt_assert(!xbt_dynar_is_empty(e_route->link_list), - "Invalid count of links, must be greater than zero (%s,%s)", - src, dst); + "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->name, dst, e_route->dst_gateway->name); + "The bypass route between \"%s\"(\"%s\") and \"%s\"(\"%s\") already exists", + src, e_route->gw_src->name, dst, e_route->gw_dst->name); - route_t new_e_route = NULL; - if(e_route->dst_gateway) + sg_platf_route_cbarg_t new_e_route = NULL; + if(e_route->gw_dst) 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); xbt_dict_set(dict_bypassRoutes, route_name, new_e_route, NULL); no_bypassroute_declared = 0; @@ -93,14 +92,122 @@ xbt_dynar_t generic_get_onelink_routes(AS_t rc) { // FIXME: kill that stub return NULL; } -route_t generic_get_bypassroute(AS_t rc, network_element_t src, network_element_t dst, double *lat) +static const char *instr_node_name(xbt_node_t node) +{ + void *data = xbt_graph_node_get_data(node); + char *str = (char *) data; + return str; +} + +xbt_node_t new_xbt_graph_node(xbt_graph_t graph, const char *name, + xbt_dict_t nodes) +{ + xbt_node_t ret = xbt_dict_get_or_null(nodes, name); + if (ret) + return ret; + + ret = xbt_graph_new_node(graph, xbt_strdup(name)); + xbt_dict_set(nodes, name, ret, NULL); + return ret; +} + +xbt_edge_t new_xbt_graph_edge(xbt_graph_t graph, xbt_node_t s, xbt_node_t d, + xbt_dict_t edges) +{ + xbt_edge_t ret; + + const char *sn = instr_node_name(s); + const char *dn = instr_node_name(d); + int len = strlen(sn) + strlen(dn) + 1; + char *name = (char *) xbt_malloc(len * sizeof(char)); + + + snprintf(name, len, "%s%s", sn, dn); + ret = xbt_dict_get_or_null(edges, name); + if (ret == NULL) { + snprintf(name, len, "%s%s", dn, sn); + ret = xbt_dict_get_or_null(edges, name); + } + + if (ret == NULL) { + ret = xbt_graph_new_edge(graph, s, d, NULL); + xbt_dict_set(edges, name, ret, NULL); + } + free(name); + return ret; +} + +void generic_get_graph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges, + AS_t rc) +{ + int src, dst; + int table_size = xbt_dynar_length(rc->index_network_elm); + + sg_platf_route_cbarg_t route = xbt_new0(s_sg_platf_route_cbarg_t, 1); + route->link_list = xbt_dynar_new(sizeof(sg_routing_link_t), NULL); + + for (src = 0; src < table_size; src++) { + sg_routing_edge_t my_src = + xbt_dynar_get_as(rc->index_network_elm, src, sg_routing_edge_t); + for (dst = 0; dst < table_size; dst++) { + if (src == dst) + continue; + sg_routing_edge_t my_dst = + xbt_dynar_get_as(rc->index_network_elm, dst, sg_routing_edge_t); + + rc->get_route_and_latency(rc, my_src, my_dst, route, NULL); + + XBT_DEBUG ("get_route_and_latency %s -> %s", my_src->name, my_dst->name); + + if (route) { + unsigned int cpt; + void *link; + + xbt_node_t current, previous; + const char *previous_name, *current_name; + + if (route->gw_src) { + previous = new_xbt_graph_node(graph, route->gw_src->name, nodes); + previous_name = route->gw_src->name; + } else { + previous = new_xbt_graph_node(graph, my_src->name, nodes); + previous_name = my_src->name; + } + + xbt_dynar_foreach(route->link_list, cpt, link) { + char *link_name = ((surf_resource_t) link)->name; + current = new_xbt_graph_node(graph, link_name, nodes); + current_name = link_name; + new_xbt_graph_edge(graph, previous, current, edges); + XBT_DEBUG (" %s -> %s", previous_name, current_name); + previous = current; + previous_name = current_name; + } + + if (route->gw_dst) { + current = new_xbt_graph_node(graph, route->gw_dst->name, nodes); + current_name = route->gw_dst->name; + } else { + current = new_xbt_graph_node(graph, my_dst->name, nodes); + current_name = my_dst->name; + } + new_xbt_graph_edge(graph, previous, current, edges); + XBT_DEBUG (" %s -> %s", previous_name, current_name); + } + } + } +} + +sg_platf_route_cbarg_t generic_get_bypassroute(AS_t rc, sg_routing_edge_t src, + sg_routing_edge_t dst, + double *lat) { // If never set a bypass route return NULL without any further computations - XBT_DEBUG("generic_get_bypassroute from %s to %s",src->name,dst->name); - if(no_bypassroute_declared) + XBT_DEBUG("generic_get_bypassroute from %s to %s", src->name, dst->name); + if (no_bypassroute_declared) return NULL; - route_t e_route_bypass = NULL; + sg_platf_route_cbarg_t e_route_bypass = NULL; xbt_dict_t dict_bypassRoutes = rc->bypassRoutes; if(dst->rc_component == rc && src->rc_component == rc ){ @@ -121,7 +228,7 @@ route_t generic_get_bypassroute(AS_t rc, network_element_t src, network_element_ if (src == NULL || dst == NULL) xbt_die("Ask for route \"from\"(%s) or \"to\"(%s) no found at AS \"%s\"", - src->name, dst->name, rc->name); + src->name, dst->name, rc->name); src_as = src->rc_component; dst_as = dst->rc_component; @@ -164,10 +271,10 @@ route_t generic_get_bypassroute(AS_t rc, network_element_t src, network_element_ for (i = 0; i < max; i++) { if (i <= max_index_src && max <= max_index_dst) { char *route_name = bprintf("%s#%s", - (*(AS_t *) - (xbt_dynar_get_ptr(path_src, i)))->name, - (*(AS_t *) - (xbt_dynar_get_ptr(path_dst, max)))->name); + (*(AS_t *) + (xbt_dynar_get_ptr(path_src, i)))->name, + (*(AS_t *) + (xbt_dynar_get_ptr(path_dst, max)))->name); e_route_bypass = xbt_dict_get_or_null(dict_bypassRoutes, route_name); xbt_free(route_name); } @@ -175,10 +282,10 @@ route_t generic_get_bypassroute(AS_t rc, network_element_t src, network_element_ break; if (max <= max_index_src && i <= max_index_dst) { char *route_name = bprintf("%s#%s", - (*(AS_t *) - (xbt_dynar_get_ptr(path_src, max)))->name, - (*(AS_t *) - (xbt_dynar_get_ptr(path_dst, i)))->name); + (*(AS_t *) + (xbt_dynar_get_ptr(path_src, max)))->name, + (*(AS_t *) + (xbt_dynar_get_ptr(path_dst, i)))->name); e_route_bypass = xbt_dict_get_or_null(dict_bypassRoutes, route_name); xbt_free(route_name); } @@ -191,10 +298,10 @@ route_t generic_get_bypassroute(AS_t rc, network_element_t src, network_element_ if (max <= max_index_src && max <= max_index_dst) { char *route_name = bprintf("%s#%s", - (*(AS_t *) - (xbt_dynar_get_ptr(path_src, max)))->name, - (*(AS_t *) - (xbt_dynar_get_ptr(path_dst, max)))->name); + (*(AS_t *) + (xbt_dynar_get_ptr(path_src, max)))->name, + (*(AS_t *) + (xbt_dynar_get_ptr(path_dst, max)))->name); e_route_bypass = xbt_dict_get_or_null(dict_bypassRoutes, route_name); xbt_free(route_name); } @@ -206,15 +313,15 @@ route_t generic_get_bypassroute(AS_t rc, network_element_t src, network_element_ xbt_dynar_free(&path_dst); } - route_t new_e_route = NULL; + sg_platf_route_cbarg_t new_e_route = NULL; if (e_route_bypass) { void *link; unsigned int cpt = 0; - 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 = xbt_new0(s_sg_platf_route_cbarg_t, 1); + new_e_route->gw_src = e_route_bypass->gw_src; + new_e_route->gw_dst = e_route_bypass->gw_dst; new_e_route->link_list = - xbt_dynar_new(global_routing->size_of_link, NULL); + xbt_dynar_new(sizeof(sg_routing_link_t), NULL); xbt_dynar_foreach(e_route_bypass->link_list, cpt, link) { xbt_dynar_push(new_e_route->link_list, &link); if (lat) @@ -227,95 +334,48 @@ 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, void *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 +/* change a route containing link names into a route containing link entities */ +sg_platf_route_cbarg_t generic_new_extended_route(e_surf_routing_hierarchy_t hierarchy, - void *data, int order) -{ + sg_platf_route_cbarg_t routearg, int change_order) { + sg_platf_route_cbarg_t result; char *link_name; - 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_t, 1); - new_e_route->link_list = xbt_dynar_new(global_routing->size_of_link, NULL); + result = xbt_new0(s_sg_platf_route_cbarg_t, 1); + result->link_list = xbt_dynar_new(sizeof(sg_routing_link_t), NULL); xbt_assert(hierarchy == SURF_ROUTING_BASE - || hierarchy == SURF_ROUTING_RECURSIVE, - "the hierarchy type is not defined"); + || hierarchy == SURF_ROUTING_RECURSIVE, + "The hierarchy of this AS is neither BASIC nor RECURSIVE, I'm lost here."); - if (hierarchy == SURF_ROUTING_BASE) { + if (hierarchy == SURF_ROUTING_RECURSIVE) { - route = (route_t) data; - links = route->link_list; - - } else if (hierarchy == SURF_ROUTING_RECURSIVE) { - - e_route = (route_t) data; - xbt_assert(e_route->src_gateway - && e_route->dst_gateway, "bad gateway, is null"); - links = e_route->link_list; + xbt_assert(routearg->gw_src && routearg->gw_dst, + "NULL is obviously a bad gateway"); /* remeber not erase the gateway names */ - new_e_route->src_gateway = e_route->src_gateway; - new_e_route->dst_gateway = e_route->dst_gateway; + result->gw_src = routearg->gw_src; + result->gw_dst = routearg->gw_dst; } - links_id = new_e_route->link_list; - - xbt_dynar_foreach(links, cpt, link_name) { + xbt_dynar_foreach(routearg->link_list, 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); + if (change_order) + xbt_dynar_push(result->link_list, &link); else - xbt_dynar_unshift(links_id, &link); + xbt_dynar_unshift(result->link_list, &link); } else THROWF(mismatch_error, 0, "Link %s not found", link_name); } - return new_e_route; + return result; } -void generic_free_route(route_t route) +void generic_free_route(sg_platf_route_cbarg_t route) { if (route) { xbt_dynar_free(&route->link_list); @@ -324,7 +384,7 @@ void generic_free_route(route_t route) } static AS_t generic_as_exist(AS_t find_from, - AS_t to_find) + AS_t to_find) { //return to_find; // FIXME: BYPASSERROR OF FOREACH WITH BREAK xbt_dict_cursor_t cursor = NULL; @@ -349,9 +409,9 @@ 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_t) - xbt_lib_get_or_null(as_router_lib, element, - ROUTING_ASR_LEVEL))->rc_component; + element_as = ((sg_routing_edge_t) + xbt_lib_get_or_null(as_router_lib, element, + ROUTING_ASR_LEVEL))->rc_component; result = ((AS_t) - 1); if (element_as != rc) result = generic_as_exist(rc, element_as); @@ -373,20 +433,20 @@ AS_t generic_processing_units_exist(AS_t rc, char *element) { AS_t element_as; - element_as = ((network_element_t) - xbt_lib_get_or_null(host_lib, - element, ROUTING_HOST_LEVEL))->rc_component; + element_as = ((sg_routing_edge_t) + xbt_lib_get_or_null(host_lib, + element, ROUTING_HOST_LEVEL))->rc_component; if (element_as == rc) return element_as; return generic_as_exist(rc, element_as); } -void generic_src_dst_check(AS_t rc, network_element_t src, - network_element_t dst) +void generic_src_dst_check(AS_t rc, sg_routing_edge_t src, + sg_routing_edge_t dst) { - network_element_t src_data = src; - network_element_t dst_data = dst; + sg_routing_edge_t src_data = src; + sg_routing_edge_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\"", @@ -406,10 +466,10 @@ void generic_src_dst_check(AS_t rc, network_element_t src, 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->name, - dst->name, - src_as->name, - dst_as->name, - rc->name); + ("The routing component of src'%s' and dst'%s' is not the same as the network elements belong (%s?=%s?=%s)", + src->name, + dst->name, + src_as->name, + dst_as->name, + rc->name); }