X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a94f7f81e51eac626e42f38a56ef32978b232a08..e0f0c45333aacc622e828ab765d2c92af04a2dd4:/src/surf/surf_routing.c diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c index 520f40356f..b989efec4d 100644 --- a/src/surf/surf_routing.c +++ b/src/surf/surf_routing.c @@ -113,10 +113,6 @@ static void generic_set_processing_unit(routing_component_t rc, const char *name); static void generic_set_autonomous_system(routing_component_t rc, const char *name); -static void generic_set_route(routing_component_t rc, const char *src, - const char *dst, name_route_t route); -static void generic_set_ASroute(routing_component_t rc, const char *src, - const char *dst, route_extended_t e_route); static void generic_set_bypassroute(routing_component_t rc, const char *src, const char *dst, route_extended_t e_route); @@ -138,6 +134,9 @@ static route_extended_t generic_get_bypassroute(routing_component_t rc, static route_extended_t generic_new_extended_route(e_surf_routing_hierarchy_t hierarchy, void *data, int order); +static route_t +generic_new_route(e_surf_routing_hierarchy_t hierarchy, + void *data, int order); static void generic_free_route(route_t route); static void generic_free_extended_route(route_extended_t e_route); static routing_component_t @@ -151,8 +150,8 @@ static void generic_src_dst_check(routing_component_t rc, const char *src, /* **************************** GLOBAL FUNCTIONS **************************** */ /* global parse functions */ -static char *src = NULL; /* temporary store the source name of a route */ -static char *dst = NULL; /* temporary store the destination name of a route */ +static const char *src = NULL; /* temporary store the source name of a route */ +static const char *dst = NULL; /* temporary store the destination name of a route */ static char *gw_src = NULL; /* temporary store the gateway source name of a route */ static char *gw_dst = NULL; /* temporary store the gateway destination name of a route */ static xbt_dynar_t link_list = NULL; /* temporary store of current list link of a route */ @@ -166,7 +165,7 @@ static void parse_S_host(char *host_id) current_routing->hierarchy = SURF_ROUTING_BASE; xbt_assert1(!xbt_dict_get_or_null (global_routing->where_network_elements, host_id), - "Reading a host, processing unit \"%s\" already exist", + "Reading a host, processing unit \"%s\" already exists", host_id); xbt_assert1(current_routing->set_processing_unit, "no defined method \"set_processing_unit\" in \"%s\"", @@ -208,7 +207,7 @@ static void parse_S_router(void) xbt_assert1(!xbt_dict_get_or_null (global_routing->where_network_elements, A_surfxml_router_id), - "Reading a router, processing unit \"%s\" already exist", + "Reading a router, processing unit \"%s\" already exists", A_surfxml_router_id); xbt_assert1(current_routing->set_processing_unit, "no defined method \"set_processing_unit\" in \"%s\"", @@ -228,7 +227,7 @@ static void parse_S_router(void) /** * \brief Set the endponints for a route */ -static void parse_S_route_new_and_endpoints(char *src_id, char *dst_id) +static void parse_S_route_new_and_endpoints(const char *src_id, const char *dst_id) { if (src != NULL && dst != NULL && link_list != NULL) THROW2(arg_error, 0, "Route between %s to %s can not be defined", @@ -253,7 +252,7 @@ static void parse_S_route_new_and_endpoints_XML(void) /** * \breif Set the endpoints for a route from lua */ -static void parse_S_route_new_and_endpoints_lua(char *id_src, char *id_dst) +static void parse_S_route_new_and_endpoints_lua(const char *id_src, const char *id_dst) { parse_S_route_new_and_endpoints(id_src, id_dst); } @@ -430,7 +429,7 @@ static void parse_S_AS(char *AS_id, char *AS_routing) xbt_assert1(!xbt_dict_get_or_null (current_routing->routing_sons, AS_id), - "The AS \"%s\" already exist", AS_id); + "The AS \"%s\" already exists", AS_id); /* it is a part of the tree */ new_routing->routing_father = current_routing; /* set the father behavior */ @@ -485,7 +484,7 @@ static void parse_E_AS(char *AS_id) network_element_info_t info = NULL; xbt_assert1(!xbt_dict_get_or_null (global_routing->where_network_elements, - current_routing->name), "The AS \"%s\" already exist", + current_routing->name), "The AS \"%s\" already exists", current_routing->name); info = xbt_new0(s_network_element_info_t, 1); info->rc_component = current_routing->routing_father; @@ -1115,6 +1114,7 @@ static void model_full_set_route(routing_component_t rc, const char *src, if(!routing->routing_table) routing->routing_table = xbt_new0(route_extended_t, table_size * table_size); + if(TO_ROUTE_FULL(*src_id, *dst_id)) { char * link_name; @@ -1130,7 +1130,7 @@ static void model_full_set_route(routing_component_t rc, const char *src, (void*)TO_ROUTE_FULL(*src_id, *dst_id)->generic_route.link_list, (void*)link_route_to_test, (int_f_cpvoid_cpvoid_t) surf_pointer_resource_cmp), - "The route between \"%s\" and \"%s\" already exist", src,dst); + "The route between \"%s\" and \"%s\" already exists", src,dst); xbt_free(link_route_to_test); } else @@ -1170,7 +1170,7 @@ static void model_full_set_route(routing_component_t rc, const char *src, (void*)TO_ROUTE_FULL(*dst_id, *src_id)->generic_route.link_list, (void*)link_route_to_test, (int_f_cpvoid_cpvoid_t) surf_pointer_resource_cmp), - "The route between \"%s\" and \"%s\" already exist", src,dst); + "The route between \"%s\" and \"%s\" already exists", src,dst); xbt_free(link_route_to_test); } else @@ -1190,7 +1190,7 @@ static void model_full_set_route(routing_component_t rc, const char *src, /* ************************************************************************** */ /* *************************** FLOYD ROUTING ******************************** */ -#define TO_FLOYD_COST(i,j) cost_table[(i)+(j)*table_size] +#define TO_FLOYD_COST(i,j) (routing->cost_table)[(i)+(j)*table_size] #define TO_FLOYD_PRED(i,j) (routing->predecessor_table)[(i)+(j)*table_size] #define TO_FLOYD_LINK(i,j) (routing->link_table)[(i)+(j)*table_size] @@ -1200,6 +1200,7 @@ typedef struct { s_routing_component_t generic_routing; /* vars for calculate the floyd algorith. */ int *predecessor_table; + double *cost_table; route_extended_t *link_table; /* char* -> int* */ } s_routing_component_floyd_t, *routing_component_floyd_t; @@ -1361,7 +1362,7 @@ static void *model_floyd_create(void) new_component->generic_routing.set_autonomous_system = generic_set_autonomous_system; new_component->generic_routing.set_route = model_floyd_set_route; - new_component->generic_routing.set_ASroute = NULL ; //TODO + new_component->generic_routing.set_ASroute = model_floyd_set_route; new_component->generic_routing.set_bypassroute = generic_set_bypassroute; new_component->generic_routing.get_route = floyd_get_route; new_component->generic_routing.get_onelink_routes = @@ -1371,7 +1372,6 @@ static void *model_floyd_create(void) new_component->generic_routing.finalize = floyd_finalize; new_component->generic_routing.to_index = xbt_dict_new(); new_component->generic_routing.bypassRoutes = xbt_dict_new(); - new_component->generic_routing.parse_routes = xbt_dict_new(); return new_component; } @@ -1388,96 +1388,184 @@ static void model_floyd_unload(void) static void model_floyd_end(void) { - routing_component_floyd_t routing = - ((routing_component_floyd_t) current_routing); - xbt_dict_cursor_t cursor = NULL; - double *cost_table; - char *key, *data, *end; - const char *sep = "#"; - xbt_dynar_t keys; - int src_id, dst_id; - unsigned int i, j, a, b, c; + routing_component_floyd_t routing = + ((routing_component_floyd_t) current_routing); - /* set the size of inicial table */ - size_t table_size = xbt_dict_length(routing->generic_routing.to_index); + unsigned int i, j, a, b, c; - /* Create Cost, Predecessor and Link tables */ - cost_table = xbt_new0(double, table_size * table_size); /* link cost from host to host */ - routing->predecessor_table = xbt_new0(int, table_size * table_size); /* predecessor host numbers */ - routing->link_table = xbt_new0(route_extended_t, table_size * table_size); /* actual link between src and dst */ - - /* Initialize costs and predecessors */ - for (i = 0; i < table_size; i++) - for (j = 0; j < table_size; j++) { - TO_FLOYD_COST(i, j) = DBL_MAX; - TO_FLOYD_PRED(i, j) = -1; - TO_FLOYD_LINK(i, j) = NULL; /* fixed, missing in the previous version */ - } + /* set the size of table routing */ + size_t table_size = xbt_dict_length(routing->generic_routing.to_index); - /* Put the routes in position */ - xbt_dict_foreach(routing->generic_routing.parse_routes, cursor, key, data) { - keys = xbt_str_split_str(key, sep); - src_id = strtol(xbt_dynar_get_as(keys, 0, char *), &end, 10); - dst_id = strtol(xbt_dynar_get_as(keys, 1, char *), &end, 10); - TO_FLOYD_LINK(src_id, dst_id) = - generic_new_extended_route(current_routing->hierarchy, data, 0); - TO_FLOYD_PRED(src_id, dst_id) = src_id; - /* set link cost */ - TO_FLOYD_COST(src_id, dst_id) = ((TO_FLOYD_LINK(src_id, dst_id))->generic_route.link_list)->used; /* count of links, old model assume 1 */ - xbt_dynar_free(&keys); - } + if(!routing->link_table) + { + /* Create Cost, Predecessor and Link tables */ + routing->cost_table = xbt_new0(double, table_size * table_size); /* link cost from host to host */ + routing->predecessor_table = xbt_new0(int, table_size * table_size); /* predecessor host numbers */ + routing->link_table = xbt_new0(route_extended_t, table_size * table_size); /* actual link between src and dst */ + + /* Initialize costs and predecessors */ + for (i = 0; i < table_size; i++) + for (j = 0; j < table_size; j++) { + TO_FLOYD_COST(i, j) = DBL_MAX; + TO_FLOYD_PRED(i, j) = -1; + TO_FLOYD_LINK(i, j) = NULL; /* fixed, missing in the previous version */ + } + } - /* Add the loopback if needed */ - if (current_routing->hierarchy == SURF_ROUTING_BASE) { - for (i = 0; i < table_size; i++) { - route_extended_t e_route = TO_FLOYD_LINK(i, i); - if (!e_route) { - e_route = xbt_new0(s_route_extended_t, 1); - e_route->src_gateway = NULL; - e_route->dst_gateway = NULL; - e_route->generic_route.link_list = - xbt_dynar_new(global_routing->size_of_link, NULL); - xbt_dynar_push(e_route->generic_route.link_list, - &global_routing->loopback); - TO_FLOYD_LINK(i, i) = e_route; - TO_FLOYD_PRED(i, i) = i; - TO_FLOYD_COST(i, i) = 1; - } - } - } - /* Calculate path costs */ - for (c = 0; c < table_size; c++) { - for (a = 0; a < table_size; a++) { - for (b = 0; b < table_size; b++) { - if (TO_FLOYD_COST(a, c) < DBL_MAX && TO_FLOYD_COST(c, b) < DBL_MAX) { - if (TO_FLOYD_COST(a, b) == DBL_MAX || - (TO_FLOYD_COST(a, c) + TO_FLOYD_COST(c, b) < - TO_FLOYD_COST(a, b))) { - TO_FLOYD_COST(a, b) = - TO_FLOYD_COST(a, c) + TO_FLOYD_COST(c, b); - TO_FLOYD_PRED(a, b) = TO_FLOYD_PRED(c, b); - } - } - } - } - } + /* Add the loopback if needed */ + if (current_routing->hierarchy == SURF_ROUTING_BASE) { + for (i = 0; i < table_size; i++) { + route_extended_t e_route = TO_FLOYD_LINK(i, i); + if (!e_route) { + e_route = xbt_new0(s_route_extended_t, 1); + e_route->src_gateway = NULL; + e_route->dst_gateway = NULL; + e_route->generic_route.link_list = + xbt_dynar_new(global_routing->size_of_link, NULL); + xbt_dynar_push(e_route->generic_route.link_list, + &global_routing->loopback); + TO_FLOYD_LINK(i, i) = e_route; + TO_FLOYD_PRED(i, i) = i; + TO_FLOYD_COST(i, i) = 1; + } + } + } + /* Calculate path costs */ + for (c = 0; c < table_size; c++) { + for (a = 0; a < table_size; a++) { + for (b = 0; b < table_size; b++) { + if (TO_FLOYD_COST(a, c) < DBL_MAX && TO_FLOYD_COST(c, b) < DBL_MAX) { + if (TO_FLOYD_COST(a, b) == DBL_MAX || + (TO_FLOYD_COST(a, c) + TO_FLOYD_COST(c, b) < + TO_FLOYD_COST(a, b))) { + TO_FLOYD_COST(a, b) = + TO_FLOYD_COST(a, c) + TO_FLOYD_COST(c, b); + TO_FLOYD_PRED(a, b) = TO_FLOYD_PRED(c, b); + } + } + } + } + } +} - /* delete the parse table */ - xbt_dict_foreach(routing->generic_routing.parse_routes, cursor, key, data) { - route_t route = (route_t) data; - xbt_dynar_free(&(route->link_list)); - xbt_free(data); - } +static void model_floyd_set_route(routing_component_t rc, const char *src, + const char *dst, name_route_extended_t route) +{ + routing_component_floyd_t routing = (routing_component_floyd_t) rc; - /* delete parse dict */ - xbt_dict_free(&(routing->generic_routing.parse_routes)); + /* set the size of table routing */ + size_t table_size = xbt_dict_length(rc->to_index); + int *src_id, *dst_id; + int i,j; - /* cleanup */ - xbt_free(cost_table); -} + src_id = xbt_dict_get_or_null(rc->to_index, src); + dst_id = xbt_dict_get_or_null(rc->to_index, dst); -static void model_floyd_set_route(routing_component_t rc, const char *src, - const char *dst, name_route_extended_t route){} + if(!routing->link_table) + { + /* Create Cost, Predecessor and Link tables */ + routing->cost_table = xbt_new0(double, table_size * table_size); /* link cost from host to host */ + routing->predecessor_table = xbt_new0(int, table_size * table_size); /* predecessor host numbers */ + routing->link_table = xbt_new0(route_extended_t, table_size * table_size); /* actual link between src and dst */ + + /* Initialize costs and predecessors */ + for (i = 0; i < table_size; i++) + for (j = 0; j < table_size; j++) { + TO_FLOYD_COST(i, j) = DBL_MAX; + TO_FLOYD_PRED(i, j) = -1; + TO_FLOYD_LINK(i, j) = NULL; /* fixed, missing in the previous version */ + } + } + + if(TO_FLOYD_LINK(*src_id, *dst_id)) + { + if(!route->dst_gateway && !route->src_gateway) + DEBUG2("See Route from \"%s\" to \"%s\"", src, dst); + else + DEBUG4("See ASroute from \"%s(%s)\" to \"%s(%s)\"", src, + route->src_gateway, dst, route->dst_gateway); + char * link_name; + unsigned int cpt; + xbt_dynar_t link_route_to_test = xbt_dynar_new(global_routing->size_of_link, NULL); + xbt_dynar_foreach(route->generic_route.link_list,cpt,link_name) + { + void *link = xbt_dict_get_or_null(surf_network_model->resource_set, link_name); + xbt_assert1(link,"Link : '%s' doesn't exists.",link_name); + xbt_dynar_push(link_route_to_test,&link); + } + xbt_assert2(!xbt_dynar_compare( + (void*)TO_FLOYD_LINK(*src_id, *dst_id)->generic_route.link_list, + (void*)link_route_to_test, + (int_f_cpvoid_cpvoid_t) surf_pointer_resource_cmp), + "The route between \"%s\" and \"%s\" already exists", src,dst); + xbt_free(link_route_to_test); + } + else + { + if(!route->dst_gateway && !route->src_gateway) + DEBUG2("Load Route from \"%s\" to \"%s\"", src, dst); + else + DEBUG4("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", src, + route->src_gateway, dst, route->dst_gateway); + + TO_FLOYD_LINK(*src_id, *dst_id) = + generic_new_extended_route(rc->hierarchy, route, 1); + TO_FLOYD_PRED(*src_id, *dst_id) = *src_id; + TO_FLOYD_COST(*src_id, *dst_id) = + ((TO_FLOYD_LINK(*src_id, *dst_id))->generic_route.link_list)->used; /* count of links, old model assume 1 */ + } + + if( A_surfxml_route_symetrical == A_surfxml_route_symetrical_YES + || A_surfxml_ASroute_symetrical == A_surfxml_ASroute_symetrical_YES ) + { + if(TO_FLOYD_LINK(*dst_id, *src_id)) + { + if(!route->dst_gateway && !route->src_gateway) + DEBUG2("See Route from \"%s\" to \"%s\"", dst, src); + else + DEBUG4("See ASroute from \"%s(%s)\" to \"%s(%s)\"", dst, + route->src_gateway, src, route->dst_gateway); + char * link_name; + unsigned int i; + xbt_dynar_t link_route_to_test = xbt_dynar_new(global_routing->size_of_link, NULL); + for(i=xbt_dynar_length(route->generic_route.link_list) ;i>0 ;i--) + { + link_name = xbt_dynar_get_as(route->generic_route.link_list,i-1,void *); + void *link = xbt_dict_get_or_null(surf_network_model->resource_set, link_name); + xbt_assert1(link,"Link : '%s' doesn't exists.",link_name); + xbt_dynar_push(link_route_to_test,&link); + } + xbt_assert2(!xbt_dynar_compare( + (void*)TO_FLOYD_LINK(*dst_id, *src_id)->generic_route.link_list, + (void*)link_route_to_test, + (int_f_cpvoid_cpvoid_t) surf_pointer_resource_cmp), + "The route between \"%s\" and \"%s\" already exists", src,dst); + xbt_free(link_route_to_test); + } + else + { + if(route->dst_gateway && route->src_gateway) + { + char * gw_src = bprintf("%s",route->src_gateway); + char * gw_dst = bprintf("%s",route->dst_gateway); + route->src_gateway = bprintf("%s",gw_dst); + route->dst_gateway = bprintf("%s",gw_src); + } + + if(!route->dst_gateway && !route->src_gateway) + DEBUG2("Load Route from \"%s\" to \"%s\"", dst, src); + else + DEBUG4("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", dst, + route->src_gateway, src, route->dst_gateway); + + TO_FLOYD_LINK(*dst_id, *src_id) = + generic_new_extended_route(rc->hierarchy, route, 0); + TO_FLOYD_PRED(*dst_id, *src_id) = *dst_id; + TO_FLOYD_COST(*dst_id, *src_id) = + ((TO_FLOYD_LINK(*dst_id, *src_id))->generic_route.link_list)->used; /* count of links, old model assume 1 */ + } + } +} /* ************************************************************************** */ /* ********** Dijkstra & Dijkstra Cached ROUTING **************************** */ @@ -1892,7 +1980,7 @@ static void *model_dijkstra_both_create(int cached) new_component->generic_routing.set_autonomous_system = generic_set_autonomous_system; new_component->generic_routing.set_route = model_dijkstra_both_set_route; - new_component->generic_routing.set_ASroute = NULL; //TODO + new_component->generic_routing.set_ASroute = model_dijkstra_both_set_route; //TODO new_component->generic_routing.set_bypassroute = generic_set_bypassroute; new_component->generic_routing.get_route = dijkstra_get_route; new_component->generic_routing.get_onelink_routes = @@ -1903,7 +1991,6 @@ static void *model_dijkstra_both_create(int cached) new_component->cached = cached; new_component->generic_routing.to_index = xbt_dict_new(); new_component->generic_routing.bypassRoutes = xbt_dict_new(); - new_component->generic_routing.parse_routes = xbt_dict_new(); return new_component; } @@ -1931,44 +2018,18 @@ static void model_dijkstra_both_end(void) { routing_component_dijkstra_t routing = (routing_component_dijkstra_t) current_routing; - xbt_dict_cursor_t cursor = NULL; - char *key, *data, *end; - const char *sep = "#"; - xbt_dynar_t keys; + xbt_node_t node = NULL; unsigned int cursor2; xbt_dynar_t nodes = NULL; - int src_id, dst_id; - route_t route; /* Create the topology graph */ routing->route_graph = xbt_graph_new_graph(1, NULL); routing->graph_node_map = xbt_dict_new(); - if (routing->cached) + if (routing->cached && !routing->route_cache) routing->route_cache = xbt_dict_new(); - /* Put the routes in position */ - xbt_dict_foreach(routing->generic_routing.parse_routes, cursor, key, data) { - keys = xbt_str_split_str(key, sep); - src_id = strtol(xbt_dynar_get_as(keys, 0, char *), &end, 10); - dst_id = strtol(xbt_dynar_get_as(keys, 1, char *), &end, 10); - route_extended_t e_route = - generic_new_extended_route(current_routing->hierarchy, data, 0); - route_new_dijkstra(routing, src_id, dst_id, e_route); - xbt_dynar_free(&keys); - } - - /* delete the parse table */ - xbt_dict_foreach(routing->generic_routing.parse_routes, cursor, key, data) { - route = (route_t) data; - xbt_dynar_free(&(route->link_list)); - xbt_free(data); - } - - /* delete parse dict */ - xbt_dict_free(&(routing->generic_routing.parse_routes)); - /* Add the loopback if needed */ if (current_routing->hierarchy == SURF_ROUTING_BASE) add_loopback_dijkstra(routing); @@ -1983,7 +2044,30 @@ static void model_dijkstra_both_end(void) } static void model_dijkstra_both_set_route (routing_component_t rc, const char *src, - const char *dst, name_route_extended_t route){}; + const char *dst, name_route_extended_t route) +{ + routing_component_dijkstra_t routing = (routing_component_dijkstra_t) rc; + int *src_id, *dst_id; + src_id = xbt_dict_get_or_null(rc->to_index, src); + dst_id = xbt_dict_get_or_null(rc->to_index, dst); + + if (routing->cached && !routing->route_cache) + routing->route_cache = xbt_dict_new(); + + if( A_surfxml_route_symetrical == A_surfxml_route_symetrical_YES + || A_surfxml_ASroute_symetrical == A_surfxml_ASroute_symetrical_YES ) + xbt_die("Route symmetrical not supported on model dijkstra"); + + if(!route->dst_gateway && !route->src_gateway) + DEBUG2("Load Route from \"%s\" to \"%s\"", src, dst); + else + DEBUG4("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", src, + route->src_gateway, dst, route->dst_gateway); + + route_extended_t e_route = + generic_new_extended_route(current_routing->hierarchy, route, 1); + route_new_dijkstra(routing, *src_id, *dst_id, e_route); +} #ifdef HAVE_PCRE_LIB /* ************************************************** */ @@ -2565,146 +2649,6 @@ static int surf_link_resource_cmp(const void *a, const void *b) { return 1; } -static void generic_set_route(routing_component_t rc, const char *src, - const char *dst, name_route_t route) -{ - DEBUG2("Load Route from \"%s\" to \"%s\"", src, dst); - xbt_dict_t _parse_routes; - xbt_dict_t _to_index; - char *route_name; - int *src_id, *dst_id,i; - unsigned long nb_links = xbt_dynar_length(route->link_name_list); - - _to_index = current_routing->to_index; - _parse_routes = current_routing->parse_routes; - - src_id = xbt_dict_get_or_null(_to_index, src); - dst_id = xbt_dict_get_or_null(_to_index, dst); - route_name = bprintf("%d#%d", *src_id, *dst_id); - - route_t route_to_test; - route_t route_sym = xbt_new0(s_route_t, 1); - - xbt_assert2(src_id - && dst_id, "Network elements %s or %s not found", src, dst); - - xbt_assert2(xbt_dynar_length(route->link_name_list) > 0, - "Invalid count of links, must be greater than zero (%s,%s)", - src, dst); - - route_to_test = xbt_dict_get_or_null(_parse_routes, route_name); - - if(route_to_test) - xbt_assert2(!xbt_dynar_compare( - (void*)route->link_name_list, - (void*)route_to_test->link_list, - (int_f_cpvoid_cpvoid_t) surf_link_resource_cmp), - "The route between \"%s\" and \"%s\" already exist", src,dst); - else - { - xbt_dict_set(_parse_routes, bprintf("%d#%d", *src_id, *dst_id), route, NULL); - } - - if(A_surfxml_route_symetrical == A_surfxml_route_symetrical_YES) - { - route_sym->link_list = xbt_dynar_new(sizeof(char *),NULL); - - for(i=nb_links ; i>0 ; i--) - { - char *link_name = xbt_new0(char,strlen(xbt_dynar_get_as(route->link_name_list, i-1, char *))); - link_name = xbt_strdup(xbt_dynar_get_as(route->link_name_list, i-1, char *)); - xbt_dynar_push_as(route_sym->link_list ,char *, link_name); - } - DEBUG2("Load Route from \"%s\" to \"%s\"", dst, src); - - route_to_test = xbt_dict_get_or_null(_parse_routes, bprintf("%d#%d",*dst_id, *src_id)); - - if(route_to_test) - xbt_assert2(!xbt_dynar_compare( - (void*)route_sym->link_list, - (void*)route_to_test->link_list, - (int_f_cpvoid_cpvoid_t) strcmp), - "The route between \"%s\" and \"%s\" already exist", dst,src); - else - { - xbt_dict_set(_parse_routes, bprintf("%d#%d",*dst_id, *src_id), route_sym, NULL); - } - } - - xbt_free(route_name); -} - -static void generic_set_ASroute(routing_component_t rc, const char *src, - const char *dst, route_extended_t e_route) -{ - DEBUG4("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", src, - e_route->src_gateway, dst, e_route->dst_gateway); - - xbt_dict_t _parse_routes; - xbt_dict_t _to_index; - char *route_name; - int *src_id, *dst_id; - _to_index = current_routing->to_index; - _parse_routes = current_routing->parse_routes; - - src_id = xbt_dict_get_or_null(_to_index, src); - dst_id = xbt_dict_get_or_null(_to_index, dst); - route_name = bprintf("%d#%d", *src_id, *dst_id); - route_t route_to_test; - - xbt_assert2(src_id - && dst_id, "Network elements %s or %s not found", src, dst); - - xbt_assert2(xbt_dynar_length(e_route->generic_route.link_list) > 0, - "Invalid count of links, must be greater than zero (%s,%s)", - src, dst); - - route_to_test = xbt_dict_get_or_null(_parse_routes, route_name); - - if(route_to_test) - xbt_assert4(!xbt_dynar_compare( - (void*) (&e_route->generic_route)->link_list, - (void*) route_to_test->link_list, - (int_f_cpvoid_cpvoid_t) strcmp), - "The route between \"%s\"(\"%s\") and \"%s\"(\"%s\") already exist", - src, e_route->src_gateway, dst, e_route->dst_gateway); - - route_name = bprintf("%d#%d", *src_id, *dst_id); - xbt_dict_set(_parse_routes, route_name, e_route, NULL); - xbt_free(route_name); - - unsigned long nb_links = xbt_dynar_length(e_route->generic_route.link_list); - - if(A_surfxml_ASroute_symetrical == A_surfxml_ASroute_symetrical_YES) - { - int i; - route_extended_t route_sym = xbt_new0(s_route_extended_t, 1); - route_sym->generic_route.link_list = xbt_dynar_new(sizeof(char *),NULL); - for(i=nb_links ; i>0 ; i--) - { - char *link_name = xbt_new0(char,strlen(xbt_dynar_get_as(e_route->generic_route.link_list, i-1, char *))); - link_name = bprintf("%s",xbt_dynar_get_as(e_route->generic_route.link_list, i-1, char *)); - xbt_dynar_push_as(route_sym->generic_route.link_list ,char *, link_name); - } - route_sym->src_gateway = xbt_new0( char,strlen(e_route->dst_gateway) ); - route_sym->src_gateway = bprintf("%s",e_route->dst_gateway); - route_sym->dst_gateway = xbt_new0( char,strlen(e_route->src_gateway) ); - route_sym->dst_gateway = bprintf("%s",e_route->src_gateway); - DEBUG4("Load ASroute from \"%s(%s)\" to \"%s(%s)\"",dst, route_sym->src_gateway,src,route_sym->dst_gateway); - - route_to_test = xbt_dict_get_or_null(_parse_routes, bprintf("%d#%d", *dst_id, *src_id)); - if(route_to_test) - xbt_assert4(!xbt_dynar_compare( - (void*) (&route_sym->generic_route)->link_list, - (void*) route_to_test->link_list, - (int_f_cpvoid_cpvoid_t) strcmp), - "The route between \"%s\"(\"%s\") and \"%s\"(\"%s\") already exist", - dst, route_sym->src_gateway, src, route_sym->dst_gateway); - xbt_dict_set(_parse_routes, bprintf("%d#%d", *dst_id, *src_id), route_sym, NULL); - - } -} - static void generic_set_bypassroute(routing_component_t rc, const char *src, const char *dst, route_extended_t e_route) @@ -2718,7 +2662,7 @@ static void generic_set_bypassroute(routing_component_t rc, "Invalid count of links, must be greater than zero (%s,%s)", src, dst); xbt_assert4(!xbt_dict_get_or_null(dict_bypassRoutes, route_name), - "The bypass route between \"%s\"(\"%s\") and \"%s\"(\"%s\") already exist", + "The bypass route between \"%s\"(\"%s\") and \"%s\"(\"%s\") already exists", src, e_route->src_gateway, dst, e_route->dst_gateway); route_extended_t new_e_route = @@ -2875,6 +2819,44 @@ static route_extended_t generic_get_bypassroute(routing_component_t rc, /* ************************************************************************** */ /* ************************* GENERIC AUX FUNCTIONS ************************** */ +static 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_assert0(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_dict_get_or_null(surf_network_model->resource_set, link_name); + if (link) { + if (order) + xbt_dynar_push(links_id, &link); + else + xbt_dynar_unshift(links_id, &link); + } else + THROW1(mismatch_error, 0, "Link %s not found", link_name); + } + + return new_route; +} + static route_extended_t generic_new_extended_route(e_surf_routing_hierarchy_t hierarchy, void *data, int order) @@ -3067,7 +3049,7 @@ static void routing_parse_Scluster(void) char *cluster_bb_bw = A_surfxml_cluster_bb_bw; char *cluster_bb_lat = A_surfxml_cluster_bb_lat; char *host_id, *groups, *link_id = NULL; - char *router_id, *link_router, *link_backbone, *route_src_dst; + char *router_id, *link_router, *link_backbone; unsigned int iter; int start, end, i; xbt_dynar_t radical_elements; @@ -3229,7 +3211,11 @@ static void routing_parse_Scluster(void) SURFXML_START_TAG(link); SURFXML_END_TAG(link); + DEBUG0(" "); + +#ifdef HAVE_PCRE_LIB char *new_suffix = bprintf("%s", ""); + char *route_src_dst; radical_elements = xbt_str_split(cluster_suffix, "."); xbt_dynar_foreach(radical_elements, iter, groups) { @@ -3239,10 +3225,6 @@ static void routing_parse_Scluster(void) } route_src_dst = bprintf("%s(.*)%s", cluster_prefix, new_suffix); - DEBUG0(" "); - -#ifdef HAVE_PCRE_LIB - DEBUG2(""); SURFXML_BUFFER_SET(route_src, route_src_dst); @@ -3396,7 +3378,7 @@ void routing_add_link(const char *link_id) */ void routing_set_route(const char *src_id, const char *dst_id) { - parse_S_route_new_and_endpoints_lua((char *) src_id, (char *) dst_id); + parse_S_route_new_and_endpoints_lua(src_id, dst_id); } /*