X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4ddbd30b67dea473bb8c43c6c226a3b3a5af987e..f4e1c8752e7100a06bec488f150eff25d928ca34:/src/surf/surf_routing_floyd.c diff --git a/src/surf/surf_routing_floyd.c b/src/surf/surf_routing_floyd.c index 4b423e74a6..f75470d352 100644 --- a/src/surf/surf_routing_floyd.c +++ b/src/surf/surf_routing_floyd.c @@ -8,52 +8,45 @@ /* Global vars */ extern routing_global_t global_routing; -extern routing_component_t current_routing; -extern model_type_t current_routing_model; XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_floyd, surf, "Routing part of surf"); -#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] +#define TO_FLOYD_COST(i,j) (as->cost_table)[(i)+(j)*table_size] +#define TO_FLOYD_PRED(i,j) (as->predecessor_table)[(i)+(j)*table_size] +#define TO_FLOYD_LINK(i,j) (as->link_table)[(i)+(j)*table_size] /* Routing model structure */ typedef struct { - s_routing_component_t generic_routing; + s_as_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; + route_t *link_table; +} s_as_floyd_t, *as_floyd_t; -static route_extended_t floyd_get_route(routing_component_t rc, - const char *src, const char *dst); +static route_t floyd_get_route(AS_t asg, const char *src, const char *dst); /* Business methods */ -static xbt_dynar_t floyd_get_onelink_routes(routing_component_t rc) +static xbt_dynar_t floyd_get_onelink_routes(AS_t asg) { xbt_dynar_t ret = xbt_dynar_new(sizeof(onelink_t), xbt_free); - routing_component_floyd_t routing = (routing_component_floyd_t) rc; - //size_t table_size = xbt_dict_length(routing->generic_routing.to_index); xbt_dict_cursor_t c1 = NULL, c2 = NULL; char *k1, *d1, *k2, *d2; - xbt_dict_foreach(routing->generic_routing.to_index, c1, k1, d1) { - xbt_dict_foreach(routing->generic_routing.to_index, c2, k2, d2) { - route_extended_t route = floyd_get_route(rc, k1, k2); + xbt_dict_foreach(asg->to_index, c1, k1, d1) { + xbt_dict_foreach(asg->to_index, c2, k2, d2) { + route_t route = floyd_get_route(asg, k1, k2); if (route) { - if (xbt_dynar_length(route->generic_route.link_list) == 1) { + if (xbt_dynar_length(route->link_list) == 1) { void *link = - *(void **) xbt_dynar_get_ptr(route->generic_route.link_list, - 0); + *(void **) xbt_dynar_get_ptr(route->link_list, 0); onelink_t onelink = xbt_new0(s_onelink_t, 1); onelink->link_ptr = link; - if (routing->generic_routing.hierarchy == SURF_ROUTING_BASE) { + if (asg->hierarchy == SURF_ROUTING_BASE) { onelink->src = xbt_strdup(k1); onelink->dst = xbt_strdup(k2); - } else if (routing->generic_routing.hierarchy == - SURF_ROUTING_RECURSIVE) { + } else if (asg->hierarchy == SURF_ROUTING_RECURSIVE) { onelink->src = xbt_strdup(route->src_gateway); onelink->dst = xbt_strdup(route->dst_gateway); } @@ -65,32 +58,28 @@ static xbt_dynar_t floyd_get_onelink_routes(routing_component_t rc) return ret; } -static route_extended_t floyd_get_route(routing_component_t rc, - const char *src, const char *dst) +static route_t floyd_get_route(AS_t asg, const char *src, const char *dst) { - xbt_assert(rc && src + xbt_assert(asg && src && dst, "Invalid params for \"get_route\" function at AS \"%s\"", - rc->name); + asg->name); /* set utils vars */ - routing_component_floyd_t routing = (routing_component_floyd_t) rc; - size_t table_size = xbt_dict_length(routing->generic_routing.to_index); + as_floyd_t as = (as_floyd_t)asg; + size_t table_size = xbt_dict_length(asg->to_index); - generic_src_dst_check(rc, src, dst); - int *src_id = xbt_dict_get_or_null(routing->generic_routing.to_index, src); - int *dst_id = xbt_dict_get_or_null(routing->generic_routing.to_index, dst); + generic_src_dst_check(asg, src, dst); + int *src_id = xbt_dict_get_or_null(asg->to_index, src); + int *dst_id = xbt_dict_get_or_null(asg->to_index, dst); xbt_assert(src_id && dst_id, "Ask for route \"from\"(%s) or \"to\"(%s) no found in the local table", src, dst); /* create a result route */ - route_extended_t 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; + route_t new_e_route = xbt_new0(s_route_t, 1); + new_e_route->link_list = xbt_dynar_new(global_routing->size_of_link, NULL); int first = 1; int pred = *dst_id; @@ -111,31 +100,30 @@ static route_extended_t floyd_get_route(routing_component_t rc, prev_gw_src = gw_src; - route_extended_t e_route = TO_FLOYD_LINK(pred, prev_pred); + route_t e_route = TO_FLOYD_LINK(pred, prev_pred); gw_src = e_route->src_gateway; gw_dst = e_route->dst_gateway; if (first) first_gw = gw_dst; - if (rc->hierarchy == SURF_ROUTING_RECURSIVE && !first + if (asg->hierarchy == SURF_ROUTING_RECURSIVE && !first && strcmp(gw_dst, prev_gw_src)) { xbt_dynar_t e_route_as_to_as = - (*(global_routing->get_route)) (gw_dst, prev_gw_src); + routing_get_route(gw_dst, prev_gw_src); xbt_assert(e_route_as_to_as, "no route between \"%s\" and \"%s\"", gw_dst, prev_gw_src); links = e_route_as_to_as; int pos = 0; xbt_dynar_foreach(links, cpt, link) { - xbt_dynar_insert_at(new_e_route->generic_route.link_list, pos, - &link); + xbt_dynar_insert_at(new_e_route->link_list, pos, &link); pos++; } } - links = e_route->generic_route.link_list; + links = e_route->link_list; xbt_dynar_foreach(links, cpt, link) { - xbt_dynar_unshift(new_e_route->generic_route.link_list, &link); + xbt_dynar_unshift(new_e_route->link_list, &link); } first = 0; @@ -143,7 +131,7 @@ static route_extended_t floyd_get_route(routing_component_t rc, xbt_assert(pred != -1, "no route from host %d to %d (\"%s\" to \"%s\")", *src_id, *dst_id, src, dst); - if (rc->hierarchy == SURF_ROUTING_RECURSIVE) { + if (asg->hierarchy == SURF_ROUTING_RECURSIVE) { new_e_route->src_gateway = xbt_strdup(gw_src); new_e_route->dst_gateway = xbt_strdup(first_gw); } @@ -151,70 +139,58 @@ static route_extended_t floyd_get_route(routing_component_t rc, return new_e_route; } -static void floyd_finalize(routing_component_t rc) +static void floyd_finalize(AS_t rc) { - routing_component_floyd_t routing = (routing_component_floyd_t) rc; + as_floyd_t as = (as_floyd_t) rc; int i, j; size_t table_size; - if (routing) { - table_size = xbt_dict_length(routing->generic_routing.to_index); + if (as) { + table_size = xbt_dict_length(as->generic_routing.to_index); /* Delete link_table */ for (i = 0; i < table_size; i++) for (j = 0; j < table_size; j++) - generic_free_extended_route(TO_FLOYD_LINK(i, j)); - xbt_free(routing->link_table); + generic_free_route(TO_FLOYD_LINK(i, j)); + xbt_free(as->link_table); /* Delete bypass dict */ - xbt_dict_free(&routing->generic_routing.bypassRoutes); + xbt_dict_free(&as->generic_routing.bypassRoutes); /* Delete index dict */ - xbt_dict_free(&(routing->generic_routing.to_index)); + xbt_dict_free(&(as->generic_routing.to_index)); /* Delete dictionary index dict, predecessor and links table */ - xbt_free(routing->predecessor_table); + xbt_free(as->predecessor_table); /* Delete structure */ xbt_free(rc); } } -routing_component_t model_floyd_create(void) +AS_t model_floyd_create(void) { - routing_component_floyd_t new_component = - xbt_new0(s_routing_component_floyd_t, 1); - new_component->generic_routing.set_processing_unit = - generic_set_processing_unit; - 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 = model_floyd_set_route; - new_component->generic_routing.set_bypassroute = generic_set_bypassroute; + as_floyd_t new_component = (as_floyd_t)model_generic_create_sized(sizeof(s_as_floyd_t)); + new_component->generic_routing.parse_route = model_floyd_parse_route; + new_component->generic_routing.parse_ASroute = model_floyd_parse_route; new_component->generic_routing.get_route = floyd_get_route; - new_component->generic_routing.get_latency = generic_get_link_latency; new_component->generic_routing.get_onelink_routes = floyd_get_onelink_routes; - new_component->generic_routing.get_bypass_route = - generic_get_bypassroute; 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.get_network_element_type = get_network_element_type; - return (routing_component_t)new_component; + return (AS_t)new_component; } -void model_floyd_end(void) +void model_floyd_end(AS_t current_routing) { - routing_component_floyd_t routing = - ((routing_component_floyd_t) current_routing); + as_floyd_t as = + ((as_floyd_t) current_routing); unsigned int i, j, a, b, c; /* set the size of table routing */ - size_t table_size = xbt_dict_length(routing->generic_routing.to_index); + size_t table_size = xbt_dict_length(as->generic_routing.to_index); - if(!routing->link_table) + if(!as->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 */ + as->cost_table = xbt_new0(double, table_size * table_size); /* link cost from host to host */ + as->predecessor_table = xbt_new0(int, table_size * table_size); /* predecessor host numbers */ + as->link_table = xbt_new0(route_t, table_size * table_size); /* actual link between src and dst */ /* Initialize costs and predecessors */ for (i = 0; i < table_size; i++) @@ -228,15 +204,14 @@ void model_floyd_end(void) /* 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); + route_t e_route = TO_FLOYD_LINK(i, i); if (!e_route) { - e_route = xbt_new0(s_route_extended_t, 1); + e_route = xbt_new0(s_route_t, 1); e_route->src_gateway = NULL; e_route->dst_gateway = NULL; - e_route->generic_route.link_list = + e_route->link_list = xbt_dynar_new(global_routing->size_of_link, NULL); - xbt_dynar_push(e_route->generic_route.link_list, - &global_routing->loopback); + xbt_dynar_push(e_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; @@ -261,10 +236,16 @@ void model_floyd_end(void) } } -void model_floyd_set_route(routing_component_t rc, const char *src, - const char *dst, name_route_extended_t route) +static int surf_pointer_resource_cmp(const void *a, const void *b) { + return a != b; +} + +//FIXME: kill dupplicates in next function with full routing + +void model_floyd_parse_route(AS_t rc, const char *src, + const char *dst, route_t route) { - routing_component_floyd_t routing = (routing_component_floyd_t) rc; + as_floyd_t as = (as_floyd_t) rc; /* set the size of table routing */ size_t table_size = xbt_dict_length(rc->to_index); @@ -277,12 +258,12 @@ void model_floyd_set_route(routing_component_t rc, const char *src, xbt_assert(src_id, "Network elements %s not found", src); xbt_assert(dst_id, "Network elements %s not found", dst); - if(!routing->link_table) + if(!as->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 */ + as->cost_table = xbt_new0(double, table_size * table_size); /* link cost from host to host */ + as->predecessor_table = xbt_new0(int, table_size * table_size); /* predecessor host numbers */ + as->link_table = xbt_new0(route_t, table_size * table_size); /* actual link between src and dst */ /* Initialize costs and predecessors */ for (i = 0; i < table_size; i++) @@ -303,14 +284,14 @@ void model_floyd_set_route(routing_component_t rc, const char *src, 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) + xbt_dynar_foreach(route->link_list,cpt,link_name) { void *link = xbt_lib_get_or_null(link_lib, link_name, SURF_LINK_LEVEL); xbt_assert(link,"Link : '%s' doesn't exists.",link_name); xbt_dynar_push(link_route_to_test,&link); } xbt_assert(!xbt_dynar_compare( - (void*)TO_FLOYD_LINK(*src_id, *dst_id)->generic_route.link_list, + (void*)TO_FLOYD_LINK(*src_id, *dst_id)->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); @@ -322,16 +303,16 @@ void model_floyd_set_route(routing_component_t rc, const char *src, else{ XBT_DEBUG("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", src, route->src_gateway, dst, route->dst_gateway); - if(global_routing->get_network_element_type((const char*)route->dst_gateway) == SURF_NETWORK_ELEMENT_NULL) + if(routing_get_network_element_type((const char*)route->dst_gateway) == SURF_NETWORK_ELEMENT_NULL) xbt_die("The dst_gateway '%s' does not exist!",route->dst_gateway); - if(global_routing->get_network_element_type((const char*)route->src_gateway) == SURF_NETWORK_ELEMENT_NULL) + if(routing_get_network_element_type((const char*)route->src_gateway) == SURF_NETWORK_ELEMENT_NULL) xbt_die("The src_gateway '%s' does not exist!",route->src_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 */ + ((TO_FLOYD_LINK(*src_id, *dst_id))->link_list)->used; /* count of links, old model assume 1 */ } if( A_surfxml_route_symmetrical == A_surfxml_route_symmetrical_YES @@ -347,15 +328,15 @@ void model_floyd_set_route(routing_component_t rc, const char *src, 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--) + for(i=xbt_dynar_length(route->link_list) ;i>0 ;i--) { - link_name = xbt_dynar_get_as(route->generic_route.link_list,i-1,void *); + link_name = xbt_dynar_get_as(route->link_list,i-1,void *); void *link = xbt_lib_get_or_null(link_lib, link_name, SURF_LINK_LEVEL); xbt_assert(link,"Link : '%s' doesn't exists.",link_name); xbt_dynar_push(link_route_to_test,&link); } xbt_assert(!xbt_dynar_compare( - (void*)TO_FLOYD_LINK(*dst_id, *src_id)->generic_route.link_list, + (void*)TO_FLOYD_LINK(*dst_id, *src_id)->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); @@ -380,7 +361,7 @@ void model_floyd_set_route(routing_component_t rc, const char *src, 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 */ + ((TO_FLOYD_LINK(*dst_id, *src_id))->link_list)->used; /* count of links, old model assume 1 */ } } }