X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/220a2e5a4021f10d1a6a4d92ae478b2d1edb0973..4d0d81bd96d9effbd8066dd9cc8956175a4af4fb:/src/surf/surf_routing.c diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c index 51eeb16d1d..983fd5f929 100644 --- a/src/surf/surf_routing.c +++ b/src/surf/surf_routing.c @@ -114,7 +114,6 @@ static void generic_set_ASroute(routing_component_t rc, const char *src, static void generic_set_bypassroute(routing_component_t rc, const char *src, const char *dst, route_extended_t e_route); -int compare_routes(route_t route1, route_t route2); /* ************************************************************************** */ /* *************** GENERIC BUSINESS METHODS (declarations) ****************** */ @@ -187,9 +186,6 @@ static void parse_S_host_lua(char *host_id) parse_S_host(host_id); } -/* - * - */ /** * \brief Add a "router" to the network element list @@ -331,8 +327,6 @@ 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); xbt_assert1(current_routing->set_route, "no defined method \"set_route\" in \"%s\"", current_routing->name); @@ -351,10 +345,6 @@ static void parse_E_ASroute_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_ASroute, "no defined method \"set_ASroute\" in \"%s\"", current_routing->name); @@ -375,10 +365,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); @@ -424,7 +410,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) { @@ -728,7 +713,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) { @@ -763,6 +749,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 * @@ -862,12 +865,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; @@ -914,7 +918,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; @@ -1040,7 +1043,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; } @@ -1056,47 +1058,21 @@ 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; 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); + /* Create table if necessary */ + if(!routing->routing_table) + { + routing->routing_table = + xbt_new0(route_extended_t, table_size * table_size); } - /* delete parse dict */ - xbt_dict_free(&(routing->generic_routing.parse_routes)); - /* Add the loopback if needed */ if (current_routing->hierarchy == SURF_ROUTING_BASE) { for (i = 0; i < table_size; i++) { @@ -2493,29 +2469,49 @@ static void generic_set_route(routing_component_t rc, const char *src, unsigned long nb_links = xbt_dynar_length(route->link_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); + routing_component_full_t routing = ((routing_component_full_t) current_routing); + size_t table_size = xbt_dict_length(routing->generic_routing.to_index); + 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(route->link_list) > 0, "Invalid count of links, must be greater than zero (%s,%s)", src, dst); - if( compare_routes(route,xbt_dict_get_or_null(_parse_routes, route_name)) ) - xbt_die(bprintf("The route between \"%s\" and \"%s\" already exist", src,dst)); + if(!strcmp(rc->routing->name,"Full")) + { + /* Create the routing table */ + if(!routing->routing_table) + routing->routing_table = xbt_new0(route_extended_t, table_size * table_size); -// xbt_assert2(!xbt_dict_get_or_null(_parse_routes, route_name), -// "The route between \"%s\" and \"%s\" already exist", src, -// dst); + route_to_test = &(TO_ROUTE_FULL(*src_id, *dst_id))->generic_route; + } + else + route_to_test = xbt_dict_get_or_null(_parse_routes, route_name); - xbt_dict_set(_parse_routes, route_name, route, NULL); - xbt_free(route_name); + if(route_to_test) + xbt_assert2(!xbt_dynar_compare( + (void*)route->link_list, + (void*)route_to_test->link_list, + (int_f_cpvoid_cpvoid_t) strcmp), + "The route between \"%s\" and \"%s\" already exist", src,dst); + + if(!strcmp(rc->routing->name,"Full")) + { + TO_ROUTE_FULL(*src_id, *dst_id) = + generic_new_extended_route(current_routing->hierarchy, route, 1); + } + else + { + route_name = bprintf("%d#%d", *src_id, *dst_id); + xbt_dict_set(_parse_routes, route_name, route, NULL); + xbt_free(route_name); + } if(A_surfxml_route_symetrical == A_surfxml_route_symetrical_YES) { @@ -2525,14 +2521,29 @@ static void generic_set_route(routing_component_t rc, const char *src, 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 *)); + link_name = xbt_strdup(xbt_dynar_get_as(route->link_list, i-1, char *)); xbt_dynar_push_as(route_sym->link_list ,char *, link_name); } DEBUG2("Load Route from \"%s\" to \"%s\"", dst, src); - if( compare_routes(route_sym,xbt_dict_get_or_null(_parse_routes, bprintf("%d#%d",*dst_id, *src_id))) ) - xbt_die(bprintf("The route between \"%s\" and \"%s\" already exist", dst,src)); - xbt_dict_set(_parse_routes, bprintf("%d#%d",*dst_id, *src_id), route_sym, NULL); - } + + if(!strcmp(rc->routing->name,"Full")) + { + TO_ROUTE_FULL(*dst_id, *src_id) = + generic_new_extended_route(current_routing->hierarchy, route_sym, 1); + } + else + { + 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); + + xbt_dict_set(_parse_routes, bprintf("%d#%d",*dst_id, *src_id), route_sym, NULL); + } + } } static void generic_set_ASroute(routing_component_t rc, const char *src, @@ -2548,26 +2559,52 @@ 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); + routing_component_full_t routing = ((routing_component_full_t) current_routing); + size_t table_size = xbt_dict_length(routing->generic_routing.to_index); + 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); - if( compare_routes((route_t) &(e_route->generic_route),xbt_dict_get_or_null(_parse_routes, route_name)) ) - xbt_die(bprintf("The route between \"%s\"(\"%s\") and \"%s\"(\"%s\") already exist", - src, e_route->src_gateway, dst, e_route->dst_gateway)); + if(!strcmp(rc->routing->name,"Full")) + { + /* Create the routing table */ + if(!routing->routing_table) + routing->routing_table = xbt_new0(route_extended_t, table_size * table_size); + + route_to_test = &((route_extended_t)(TO_ROUTE_FULL(*src_id, *dst_id)))->generic_route; + } + else + 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); + if(!strcmp(rc->routing->name,"Full")) + { + TO_ROUTE_FULL(*src_id, *dst_id) = + generic_new_extended_route(current_routing->hierarchy, &(e_route->generic_route), 1); + } + else + { + 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; @@ -2585,11 +2622,23 @@ static void generic_set_ASroute(routing_component_t rc, const char *src, 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); - if( compare_routes((route_t) &(route_sym->generic_route),xbt_dict_get_or_null(_parse_routes,bprintf("%d#%d", *dst_id, *src_id))) ) - xbt_die(bprintf("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); + if(!strcmp(rc->routing->name,"Full")) + { + TO_ROUTE_FULL(*dst_id, *src_id) = + generic_new_extended_route(current_routing->hierarchy, &(route_sym->generic_route), 1); + } + else + { + 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); + } } } @@ -3294,26 +3343,3 @@ void routing_store_route(void) { parse_E_route_store_route(); } - -/* - * Compare two routes to know if the second route is in the table. - * route1 : route to store - * route2 : old route in the table - */ -int compare_routes(route_t route1, route_t route2) -{ - if(!route2) return 0; - if(xbt_dynar_length(route1->link_list) == xbt_dynar_length(route2->link_list)) - { - int i; - int nb_links = xbt_dynar_length(route1->link_list); - for(i=0 ; ilink_list, i, char *); - char *link_name2 = xbt_dynar_get_as(route2->link_list, i, char *); - if(strcmp(link_name1,link_name2)) return 1; - } - return 0; - } - return 1; -}