X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7b655045b43dc7088dd3694ab75fc7f0edbd3bc6..a94f7f81e51eac626e42f38a56ef32978b232a08:/src/surf/surf_routing.c diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c index b99054e348..520f40356f 100644 --- a/src/surf/surf_routing.c +++ b/src/surf/surf_routing.c @@ -31,11 +31,15 @@ static void *model_full_create(void); /* create structures for full routing mo static void model_full_load(void); /* load parse functions for full routing model */ static void model_full_unload(void); /* unload parse functions for full routing model */ static void model_full_end(void); /* finalize the creation of full routing model */ +static void model_full_set_route( /* Set the route and ASroute between src and dst */ + routing_component_t rc, const char *src, const char *dst, name_route_extended_t route); static void *model_floyd_create(void); /* create structures for floyd routing model */ static void model_floyd_load(void); /* load parse functions for floyd routing model */ static void model_floyd_unload(void); /* unload parse functions for floyd routing model */ static void model_floyd_end(void); /* finalize the creation of floyd routing model */ +static void model_floyd_set_route(routing_component_t rc, const char *src, + const char *dst, name_route_extended_t route); static void *model_dijkstra_both_create(int cached); /* create by calling dijkstra or dijkstracache */ static void *model_dijkstra_create(void); /* create structures for dijkstra routing model */ @@ -43,6 +47,8 @@ static void *model_dijkstracache_create(void); /* create structures for dijkstr static void model_dijkstra_both_load(void); /* load parse functions for dijkstra routing model */ static void model_dijkstra_both_unload(void); /* unload parse functions for dijkstra routing model */ static void model_dijkstra_both_end(void); /* finalize the creation of dijkstra routing model */ +static void model_dijkstra_both_set_route (routing_component_t rc, const char *src, + const char *dst, name_route_extended_t route); static void *model_rulebased_create(void); /* create structures for rulebased routing model */ static void model_rulebased_load(void); /* load parse functions for rulebased routing model */ @@ -54,9 +60,10 @@ static void model_none_load(void); /* none routing model */ static void model_none_unload(void); /* none routing model */ static void model_none_end(void); /* none routing model */ -static void routing_full_parse_Scluster(void); /*cluster bypass */ +static void routing_parse_Scluster(void); /*cluster bypass */ -static void parse_Sconfig(void); /*config Tag */ +static void routing_parse_Sconfig(void); /*config Tag */ +static void routing_parse_Econfig(void); /*config Tag */ /* this lines are only for replace use like index in the model table */ typedef enum { @@ -107,13 +114,16 @@ static void generic_set_processing_unit(routing_component_t rc, 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, route_t route); + 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); +static int surf_link_resource_cmp(const void *a, const void *b); +static int surf_pointer_resource_cmp(const void *a, const void *b); + /* ************************************************************************** */ /* *************** GENERIC BUSINESS METHODS (declarations) ****************** */ @@ -146,7 +156,6 @@ static char *dst = NULL; /* temporary store the destination name of a rou 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 */ - /** * \brief Add a "host" to the network element list */ @@ -186,9 +195,6 @@ static void parse_S_host_lua(char *host_id) parse_S_host(host_id); } -/* - * - */ /** * \brief Add a "router" to the network element list @@ -328,10 +334,8 @@ static void parse_E_link_c_ctn_new_elem_lua(char *link_id) */ static void parse_E_route_store_route(void) { - route_t route = xbt_new0(s_route_t, 1); - route->link_list = link_list; - //xbt_assert1(generic_processing_units_exist(current_routing,src),"the \"%s\" processing units gateway does not exist",src); - //xbt_assert1(generic_processing_units_exist(current_routing,dst),"the \"%s\" processing units gateway does not exist",dst); + name_route_extended_t route = xbt_new0(s_name_route_extended_t, 1); + route->generic_route.link_list = link_list; xbt_assert1(current_routing->set_route, "no defined method \"set_route\" in \"%s\"", current_routing->name); @@ -346,14 +350,10 @@ static void parse_E_route_store_route(void) */ static void parse_E_ASroute_store_route(void) { - route_extended_t e_route = xbt_new0(s_route_extended_t, 1); + name_route_extended_t e_route = xbt_new0(s_name_route_extended_t, 1); e_route->generic_route.link_list = link_list; e_route->src_gateway = xbt_strdup(gw_src); e_route->dst_gateway = xbt_strdup(gw_dst); -// xbt_assert1(generic_autonomous_system_exist(current_routing,src),"the \"%s\" autonomous system does not exist",src); -// xbt_assert1(generic_autonomous_system_exist(current_routing,dst),"the \"%s\" autonomous system does not exist",dst); -// xbt_assert1(generic_processing_units_exist(current_routing,gw_src),"the \"%s\" processing units gateway does not exist",gw_src); -// xbt_assert1(generic_processing_units_exist(current_routing,gw_dst),"the \"%s\" processing units gateway does not exist",gw_dst); xbt_assert1(current_routing->set_ASroute, "no defined method \"set_ASroute\" in \"%s\"", current_routing->name); @@ -374,10 +374,6 @@ static void parse_E_bypassRoute_store_route(void) e_route->generic_route.link_list = link_list; e_route->src_gateway = xbt_strdup(gw_src); e_route->dst_gateway = xbt_strdup(gw_dst); -// xbt_assert1(generic_autonomous_system_exist(current_routing,src),"the \"%s\" autonomous system does not exist",src); -// xbt_assert1(generic_autonomous_system_exist(current_routing,dst),"the \"%s\" autonomous system does not exist",dst); -// xbt_assert1(generic_processing_units_exist(current_routing,gw_src),"the \"%s\" processing units gateway does not exist",gw_src); -// xbt_assert1(generic_processing_units_exist(current_routing,gw_dst),"the \"%s\" processing units gateway does not exist",gw_dst); xbt_assert1(current_routing->set_bypassroute, "no defined method \"set_bypassroute\" in \"%s\"", current_routing->name); @@ -423,7 +419,6 @@ static void parse_S_AS(char *AS_id, char *AS_routing) new_routing->hierarchy = SURF_ROUTING_NULL; new_routing->name = xbt_strdup(AS_id); new_routing->routing_sons = xbt_dict_new(); - //INFO2("Routing %s for AS %s",A_surfxml_AS_routing,A_surfxml_AS_id); if (current_routing == NULL && global_routing->root == NULL) { @@ -727,7 +722,8 @@ static route_extended_t _get_route(const char *src, const char *dst) * \param dst the destination host name * * walk through the routing components tree and find a route between hosts - * by calling the differents "get_route" functions in each routing component + * by calling the differents "get_route" functions in each routing component. + * No need to free the returned dynar. It will be freed at the next call. */ static xbt_dynar_t get_route(const char *src, const char *dst) { @@ -762,6 +758,23 @@ static xbt_dynar_t get_route(const char *src, const char *dst) return global_routing->last_route; } +/** + * \brief Generic method: find a route between hosts + * + * \param src the source host name + * \param dst the destination host name + * + * walk through the routing components tree and find a route between hosts + * by calling the differents "get_route" functions in each routing component. + * Leaves the caller the responsability to clean the returned dynar. + */ +static xbt_dynar_t get_route_no_cleanup(const char *src, const char *dst) +{ + xbt_dynar_t d = get_route(src,dst); + global_routing->last_route = NULL; + return d; +} + /** * \brief Recursive function for finalize * @@ -861,12 +874,13 @@ void routing_model_create(size_t size_of_links, void *loopback) global_routing->where_network_elements = xbt_dict_new(); global_routing->root = NULL; global_routing->get_route = get_route; + global_routing->get_route_no_cleanup = get_route_no_cleanup; global_routing->get_onelink_routes = get_onelink_routes; global_routing->get_network_element_type = get_network_element_type; global_routing->finalize = finalize; global_routing->loopback = loopback; global_routing->size_of_link = size_of_links; - global_routing->last_route = xbt_dynar_new(size_of_links, NULL); + global_routing->last_route = NULL; /* no current routing at moment */ current_routing = NULL; @@ -896,9 +910,12 @@ void routing_model_create(size_t size_of_links, void *loopback) surfxml_add_callback(ETag_surfxml_AS_cb_list, &parse_E_AS_XML); surfxml_add_callback(STag_surfxml_cluster_cb_list, - &routing_full_parse_Scluster); + &routing_parse_Scluster); - surfxml_add_callback(STag_surfxml_config_cb_list, &parse_Sconfig); + surfxml_add_callback(STag_surfxml_config_cb_list, + &routing_parse_Sconfig); + surfxml_add_callback(ETag_surfxml_config_cb_list, + &routing_parse_Econfig); } /* ************************************************************************** */ @@ -910,7 +927,6 @@ void routing_model_create(size_t size_of_links, void *loopback) typedef struct { s_routing_component_t generic_routing; - xbt_dict_t parse_routes; /* store data during the parse process */ route_extended_t *routing_table; } s_routing_component_full_t, *routing_component_full_t; @@ -1025,8 +1041,8 @@ static void *model_full_create(void) generic_set_processing_unit; new_component->generic_routing.set_autonomous_system = generic_set_autonomous_system; - new_component->generic_routing.set_route = generic_set_route; - new_component->generic_routing.set_ASroute = generic_set_ASroute; + new_component->generic_routing.set_route = model_full_set_route; + new_component->generic_routing.set_ASroute = model_full_set_route; new_component->generic_routing.set_bypassroute = generic_set_bypassroute; new_component->generic_routing.get_route = full_get_route; new_component->generic_routing.get_onelink_routes = @@ -1036,7 +1052,6 @@ static void *model_full_create(void) new_component->generic_routing.finalize = full_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; } @@ -1052,46 +1067,17 @@ static void model_full_unload(void) static void model_full_end(void) { - - char *key, *end; - const char *sep = "#"; - int src_id, dst_id; - unsigned int i, j; - route_t route; + unsigned int i; route_extended_t e_route; - void *data; - - xbt_dict_cursor_t cursor = NULL; - xbt_dynar_t keys = NULL; /* set utils vars */ routing_component_full_t routing = ((routing_component_full_t) current_routing); size_t table_size = xbt_dict_length(routing->generic_routing.to_index); - /* Create the routing table */ - routing->routing_table = - xbt_new0(route_extended_t, table_size * table_size); - - /* 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_ROUTE_FULL(src_id, dst_id) = - generic_new_extended_route(current_routing->hierarchy, data, 1); - 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)); + /* Create table if necessary */ + if(!routing->routing_table) + routing->routing_table = xbt_new0(route_extended_t, table_size * table_size); /* Add the loopback if needed */ if (current_routing->hierarchy == SURF_ROUTING_BASE) { @@ -1109,12 +1095,96 @@ static void model_full_end(void) } } } +} - /* Shrink the dynar routes (save unused slots) */ - for (i = 0; i < table_size; i++) - for (j = 0; j < table_size; j++) - if (TO_ROUTE_FULL(i, j)) - xbt_dynar_shrink(TO_ROUTE_FULL(i, j)->generic_route.link_list, 0); +static void model_full_set_route(routing_component_t rc, const char *src, + const char *dst, name_route_extended_t route) +{ + 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); + routing_component_full_t routing = ((routing_component_full_t) rc); + size_t table_size = xbt_dict_length(routing->generic_routing.to_index); + + xbt_assert2(src_id + && dst_id, "Network elements %s or %s not found", src, dst); + + xbt_assert2(xbt_dynar_length(route->generic_route.link_list) > 0, + "Invalid count of links, must be greater than zero (%s,%s)", + src, dst); + + 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; + unsigned int i; + xbt_dynar_t link_route_to_test = xbt_dynar_new(global_routing->size_of_link, NULL); + xbt_dynar_foreach(route->generic_route.link_list,i,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_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); + 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_ROUTE_FULL(*src_id, *dst_id) = generic_new_extended_route(rc->hierarchy,route,1); + xbt_dynar_shrink(TO_ROUTE_FULL(*src_id, *dst_id)->generic_route.link_list, 0); + } + + if( A_surfxml_route_symetrical == A_surfxml_route_symetrical_YES + || A_surfxml_ASroute_symetrical == A_surfxml_ASroute_symetrical_YES ) + { + 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(TO_ROUTE_FULL(*dst_id, *src_id)) + { + 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_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); + xbt_free(link_route_to_test); + } + else + { + 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_ROUTE_FULL(*dst_id, *src_id) = generic_new_extended_route(rc->hierarchy,route,0); + xbt_dynar_shrink(TO_ROUTE_FULL(*dst_id, *src_id)->generic_route.link_list, 0); + } + + } } /* ************************************************************************** */ @@ -1290,8 +1360,8 @@ static void *model_floyd_create(void) generic_set_processing_unit; new_component->generic_routing.set_autonomous_system = generic_set_autonomous_system; - new_component->generic_routing.set_route = generic_set_route; - new_component->generic_routing.set_ASroute = generic_set_ASroute; + new_component->generic_routing.set_route = model_floyd_set_route; + new_component->generic_routing.set_ASroute = NULL ; //TODO 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 = @@ -1406,6 +1476,9 @@ static void model_floyd_end(void) xbt_free(cost_table); } +static void model_floyd_set_route(routing_component_t rc, const char *src, + const char *dst, name_route_extended_t route){} + /* ************************************************************************** */ /* ********** Dijkstra & Dijkstra Cached ROUTING **************************** */ @@ -1818,8 +1891,8 @@ static void *model_dijkstra_both_create(int cached) generic_set_processing_unit; new_component->generic_routing.set_autonomous_system = generic_set_autonomous_system; - new_component->generic_routing.set_route = generic_set_route; - new_component->generic_routing.set_ASroute = generic_set_ASroute; + new_component->generic_routing.set_route = model_dijkstra_both_set_route; + new_component->generic_routing.set_ASroute = NULL; //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 = @@ -1909,6 +1982,8 @@ 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){}; #ifdef HAVE_PCRE_LIB /* ************************************************** */ @@ -1986,7 +2061,7 @@ static void model_rulebased_set_autonomous_system(routing_component_t rc, static void model_rulebased_set_route(routing_component_t rc, const char *src, const char *dst, - route_t route) + name_route_extended_t route) { routing_component_rulebased_t routing = (routing_component_rulebased_t) rc; @@ -2001,14 +2076,14 @@ static void model_rulebased_set_route(routing_component_t rc, xbt_assert3(ruleroute->re_src, "PCRE compilation failed at offset %d (\"%s\"): %s\n", erroffset, dst, error); - ruleroute->re_str_link = route->link_list; + ruleroute->re_str_link = route->generic_route.link_list; xbt_dynar_push(routing->list_route, &ruleroute); xbt_free(route); } static void model_rulebased_set_ASroute(routing_component_t rc, const char *src, const char *dst, - route_extended_t route) + name_route_extended_t route) { routing_component_rulebased_t routing = (routing_component_rulebased_t) rc; @@ -2478,51 +2553,85 @@ static void generic_set_autonomous_system(routing_component_t rc, xbt_dict_set(_to_index, name, id, xbt_free); } +static int surf_pointer_resource_cmp(const void *a, const void *b) { + if(a == b) + return 0; + return 1; +} + +static int surf_link_resource_cmp(const void *a, const void *b) { + if( memcmp(a,b,global_routing->size_of_link) == 0 ); + return 0; + return 1; +} + static void generic_set_route(routing_component_t rc, const char *src, - const char *dst, route_t route) + 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; - unsigned long nb_links = xbt_dynar_length(route->link_list); + int *src_id, *dst_id,i; + unsigned long nb_links = xbt_dynar_length(route->link_name_list); _to_index = current_routing->to_index; - //TODO _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); - route_name = bprintf("%d#%d", *src_id, *dst_id); - xbt_assert2(xbt_dynar_length(route->link_list) > 0, + xbt_assert2(xbt_dynar_length(route->link_name_list) > 0, "Invalid count of links, must be greater than zero (%s,%s)", src, dst); - xbt_assert2(!xbt_dict_get_or_null(_parse_routes, route_name), - "The route between \"%s\" and \"%s\" already exist", src, - dst); - xbt_dict_set(_parse_routes, route_name, route, NULL); - xbt_free(route_name); + 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) { - int i; - route_t route_sym = xbt_new0(s_route_t, 1); 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_list, i-1, char *))); - link_name = bprintf("%s",xbt_dynar_get_as(route->link_list, i-1, char *)); + 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); - xbt_dict_set(_parse_routes, bprintf("%d#%d",*dst_id, *src_id), route_sym, NULL); - } + + 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, @@ -2538,25 +2647,34 @@ static void generic_set_ASroute(routing_component_t rc, const char *src, _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); - route_name = bprintf("%d#%d", *src_id, *dst_id); 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); - xbt_assert4(!xbt_dict_get_or_null(_parse_routes, route_name), - "The route between \"%s\"(\"%s\") and \"%s\"(\"%s\") already exist", - src, e_route->src_gateway, dst, e_route->dst_gateway); + 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; @@ -2573,7 +2691,17 @@ static void generic_set_ASroute(routing_component_t rc, const char *src, 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); + } } @@ -2907,13 +3035,25 @@ static void generic_src_dst_check(routing_component_t rc, const char *src, rc->name, dst_as->name); } -static void parse_Sconfig(void) +static void routing_parse_Sconfig(void) { //TODO DEBUG0("WARNING tag config not yet implemented."); + DEBUG1("Configuration name = %s",A_surfxml_config_id); +} + +static void routing_parse_Econfig(void) +{ + //TODO + xbt_dict_cursor_t cursor = NULL; + char *key; + char *elem; + xbt_dict_foreach(current_property_set, cursor, key, elem) { + DEBUG2("property : %s = %s",key,elem); + } } -static void routing_full_parse_Scluster(void) +static void routing_parse_Scluster(void) { static int AX_ptr = 0; @@ -2933,11 +3073,7 @@ static void routing_full_parse_Scluster(void) xbt_dynar_t radical_elements; xbt_dynar_t radical_ends; int cluster_sharing_policy = AX_surfxml_cluster_sharing_policy; - - if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX) - {DEBUG0("cluster with sharing_policy FULLDUPLEX");} - if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_SHARED) - {DEBUG0("cluster with sharing_policy SHARED");} + int cluster_bb_sharing_policy = AX_surfxml_cluster_bb_sharing_policy; #ifndef HAVE_PCRE_LIB xbt_dynar_t tab_elements_num = xbt_dynar_new(sizeof(int), NULL); @@ -2990,6 +3126,8 @@ static void routing_full_parse_Scluster(void) A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED; if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX) {A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_FULLDUPLEX;} + if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FATPIPE) + {A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_FATPIPE;} SURFXML_BUFFER_SET(link_id, link_id); SURFXML_BUFFER_SET(link_bandwidth, cluster_bw); SURFXML_BUFFER_SET(link_latency, cluster_lat); @@ -3029,6 +3167,8 @@ static void routing_full_parse_Scluster(void) A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED; if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX) {A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_FULLDUPLEX;} + if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FATPIPE) + {A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_FATPIPE;} SURFXML_BUFFER_SET(link_id, link_id); SURFXML_BUFFER_SET(link_bandwidth, cluster_bw); SURFXML_BUFFER_SET(link_latency, cluster_lat); @@ -3064,6 +3204,8 @@ static void routing_full_parse_Scluster(void) A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED; if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX) {A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_FULLDUPLEX;} + if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FATPIPE) + {A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_FATPIPE;} SURFXML_BUFFER_SET(link_id, link_router); SURFXML_BUFFER_SET(link_bandwidth, cluster_bw); SURFXML_BUFFER_SET(link_latency, cluster_lat); @@ -3076,6 +3218,8 @@ static void routing_full_parse_Scluster(void) DEBUG3("", link_backbone,cluster_bw, cluster_lat); A_surfxml_link_state = A_surfxml_link_state_ON; A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED; + if(cluster_bb_sharing_policy == A_surfxml_cluster_bb_sharing_policy_FATPIPE) + {A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_FATPIPE;} SURFXML_BUFFER_SET(link_id, link_backbone); SURFXML_BUFFER_SET(link_bandwidth, cluster_bb_bw); SURFXML_BUFFER_SET(link_latency, cluster_bb_lat); @@ -3108,6 +3252,7 @@ static void routing_full_parse_Scluster(void) DEBUG1("", cluster_id); SURFXML_BUFFER_SET(link_ctn_id, bprintf("%s_link_$1src", cluster_id)); + A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE; if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX) {A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_UP;} SURFXML_START_TAG(link_ctn); @@ -3121,8 +3266,9 @@ static void routing_full_parse_Scluster(void) DEBUG1("", cluster_id); SURFXML_BUFFER_SET(link_ctn_id, bprintf("%s_link_$1dst", cluster_id)); + A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE; if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX) - {A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_UP;} + {A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_DOWN;} SURFXML_START_TAG(link_ctn); SURFXML_END_TAG(link_ctn); @@ -3174,6 +3320,7 @@ static void routing_full_parse_Scluster(void) DEBUG1("", route_src); SURFXML_BUFFER_SET(link_ctn_id, route_src); + A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE; if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX) {A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_UP;} SURFXML_START_TAG(link_ctn); @@ -3181,13 +3328,15 @@ static void routing_full_parse_Scluster(void) DEBUG1("", cluster_id); SURFXML_BUFFER_SET(link_ctn_id, bprintf("%s_backbone", cluster_id)); + A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE; SURFXML_START_TAG(link_ctn); SURFXML_END_TAG(link_ctn); DEBUG1("", route_dst); SURFXML_BUFFER_SET(link_ctn_id, route_dst); + A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE; if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX) - {A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_UP;} + {A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_DOWN;} SURFXML_START_TAG(link_ctn); SURFXML_END_TAG(link_ctn);