X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1b531b916a0eae7de729c2f1e99d050dbcb3ebba..f55ebe8f51eaa911242266638068e2c91e958db9:/src/surf/surf_routing_floyd.c diff --git a/src/surf/surf_routing_floyd.c b/src/surf/surf_routing_floyd.c index 7e4f4c2d27..d2624082fd 100644 --- a/src/surf/surf_routing_floyd.c +++ b/src/surf/surf_routing_floyd.c @@ -25,65 +25,67 @@ typedef struct { route_t *link_table; } s_as_floyd_t, *as_floyd_t; -static void floyd_get_route(AS_t asg, const char *src, const char *dst, route_t res); +static void floyd_get_route_and_latency(AS_t asg, network_element_t src, network_element_t dst, + route_t res, double *lat); /* Business methods */ static xbt_dynar_t floyd_get_onelink_routes(AS_t asg) { xbt_dynar_t ret = xbt_dynar_new(sizeof(onelink_t), xbt_free); - route_t route = xbt_new0(s_route_t, 1); route->link_list = xbt_dynar_new(global_routing->size_of_link, NULL); - xbt_dict_cursor_t c1 = NULL, c2 = NULL; - char *k1, *d1, *k2, *d2; - xbt_dict_foreach(asg->to_index, c1, k1, d1) { - xbt_dict_foreach(asg->to_index, c2, k2, d2) { + int src,dst; + network_element_t src_elm, dst_elm; + int table_size = xbt_dynar_length(asg->index_network_elm); + for(src=0; src < table_size; src++) { + for(dst=0; dst< table_size; dst++) { xbt_dynar_reset(route->link_list); - floyd_get_route(asg, k1, k2, route); + src_elm = xbt_dynar_get_as(asg->index_network_elm,src,network_element_t); + dst_elm = xbt_dynar_get_as(asg->index_network_elm,dst,network_element_t); + floyd_get_route_and_latency(asg, src_elm, dst_elm, route, NULL); + if (xbt_dynar_length(route->link_list) == 1) { void *link = *(void **) xbt_dynar_get_ptr(route->link_list, 0); onelink_t onelink = xbt_new0(s_onelink_t, 1); onelink->link_ptr = link; if (asg->hierarchy == SURF_ROUTING_BASE) { - onelink->src = xbt_strdup(k1); - onelink->dst = xbt_strdup(k2); + onelink->src = src_elm; + onelink->dst = dst_elm; } else if (asg->hierarchy == SURF_ROUTING_RECURSIVE) { - onelink->src = xbt_strdup(route->src_gateway); - onelink->dst = xbt_strdup(route->dst_gateway); + onelink->src = route->src_gateway; + onelink->dst = route->dst_gateway; } xbt_dynar_push(ret, &onelink); } } } + return ret; } -static void floyd_get_route(AS_t asg, const char *src, const char *dst, route_t res) +static void floyd_get_route_and_latency(AS_t asg, network_element_t src, network_element_t dst, + route_t res, double *lat) { - xbt_assert(asg && src - && dst, - "Invalid params for \"get_route\" function at AS \"%s\"", - asg->name); /* set utils vars */ as_floyd_t as = (as_floyd_t)asg; - size_t table_size = xbt_dict_length(asg->to_index); + size_t table_size = xbt_dynar_length(asg->index_network_elm); 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); + int *src_id = &(src->id); + int *dst_id = &(dst->id); + if (src_id == NULL || dst_id == NULL) + THROWF(arg_error,0,"No route from '%s' to '%s'", + src->name, + dst->name); /* create a result route */ int first = 1; int pred = *dst_id; int prev_pred = 0; - char *gw_src = NULL, *gw_dst = NULL, *prev_gw_src, *first_gw = NULL; + network_element_t gw_src, gw_dst, prev_gw_src, first_gw; unsigned int cpt; void *link; xbt_dynar_t links; @@ -94,8 +96,9 @@ static void floyd_get_route(AS_t asg, const char *src, const char *dst, route_t if (pred == -1) /* if no pred in route -> no route to host */ break; xbt_assert(TO_FLOYD_LINK(pred, prev_pred), - "Invalid link for the route between \"%s\" or \"%s\"", src, - dst); + "Invalid link for the route between \"%s\" or \"%s\"", + src->name, + dst->name); prev_gw_src = gw_src; @@ -107,34 +110,39 @@ static void floyd_get_route(AS_t asg, const char *src, const char *dst, route_t first_gw = gw_dst; if (asg->hierarchy == SURF_ROUTING_RECURSIVE && !first - && strcmp(gw_dst, prev_gw_src)) { - xbt_dynar_t e_route_as_to_as = - 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); + && strcmp(gw_dst->name, prev_gw_src->name)) { + xbt_dynar_t e_route_as_to_as; + e_route_as_to_as = xbt_dynar_new(global_routing->size_of_link, NULL); + routing_get_route_and_latency(gw_dst, prev_gw_src,&e_route_as_to_as,NULL); links = e_route_as_to_as; int pos = 0; xbt_dynar_foreach(links, cpt, link) { xbt_dynar_insert_at(res->link_list, pos, &link); + if (lat) + *lat += surf_network_model->extension.network.get_link_latency(link); pos++; } + xbt_dynar_free(&e_route_as_to_as); } links = e_route->link_list; xbt_dynar_foreach(links, cpt, link) { xbt_dynar_unshift(res->link_list, &link); + if (lat) + *lat += surf_network_model->extension.network.get_link_latency(link); } first = 0; } while (pred != *src_id); - xbt_assert(pred != -1, "no route from host %d to %d (\"%s\" to \"%s\")", - *src_id, *dst_id, src, dst); + if (pred == -1) + THROWF(arg_error,0,"No route from '%s' to '%s'", + src->name, + dst->name); if (asg->hierarchy == SURF_ROUTING_RECURSIVE) { - res->src_gateway = xbt_strdup(gw_src); - res->dst_gateway = xbt_strdup(first_gw); + res->src_gateway = gw_src; + res->dst_gateway = first_gw; } - } static void floyd_finalize(AS_t rc) @@ -143,7 +151,7 @@ static void floyd_finalize(AS_t rc) int i, j; size_t table_size; if (as) { - table_size = xbt_dict_length(as->generic_routing.to_index); + table_size = xbt_dynar_length(as->generic_routing.index_network_elm); /* Delete link_table */ for (i = 0; i < table_size; i++) for (j = 0; j < table_size; j++) @@ -151,12 +159,11 @@ static void floyd_finalize(AS_t rc) xbt_free(as->link_table); /* Delete bypass dict */ xbt_dict_free(&as->generic_routing.bypassRoutes); - /* Delete index dict */ - xbt_dict_free(&(as->generic_routing.to_index)); - /* Delete dictionary index dict, predecessor and links table */ + /* Delete predecessor and cost table */ xbt_free(as->predecessor_table); - /* Delete structure */ - xbt_free(rc); + xbt_free(as->cost_table); + + model_generic_finalize(rc); } } @@ -165,7 +172,7 @@ AS_t model_floyd_create(void) 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_route_and_latency = floyd_get_route_and_latency; new_component->generic_routing.get_onelink_routes = floyd_get_onelink_routes; new_component->generic_routing.finalize = floyd_finalize; @@ -181,7 +188,7 @@ void model_floyd_end(AS_t current_routing) unsigned int i, j, a, b, c; /* set the size of table routing */ - size_t table_size = xbt_dict_length(as->generic_routing.to_index); + size_t table_size = xbt_dynar_length(as->generic_routing.index_network_elm); if(!as->link_table) { @@ -200,7 +207,7 @@ void model_floyd_end(AS_t current_routing) } /* Add the loopback if needed */ - if (current_routing->hierarchy == SURF_ROUTING_BASE) { + if (global_routing->loopback && current_routing->hierarchy == SURF_ROUTING_BASE) { for (i = 0; i < table_size; i++) { route_t e_route = TO_FLOYD_LINK(i, i); if (!e_route) { @@ -234,7 +241,7 @@ void model_floyd_end(AS_t current_routing) } } -static int surf_pointer_resource_cmp(const void *a, const void *b) { +static int floyd_pointer_resource_cmp(const void *a, const void *b) { return a != b; } @@ -246,18 +253,20 @@ void model_floyd_parse_route(AS_t rc, const char *src, as_floyd_t as = (as_floyd_t) rc; /* set the size of table routing */ - size_t table_size = xbt_dict_length(rc->to_index); - int *src_id, *dst_id; - int i,j; + size_t table_size = xbt_dynar_length(rc->index_network_elm); + network_element_t src_net_elm, dst_net_elm; - src_id = xbt_dict_get_or_null(rc->to_index, src); - dst_id = xbt_dict_get_or_null(rc->to_index, dst); + src_net_elm = (network_element_t)xbt_lib_get_or_null(host_lib, src, ROUTING_HOST_LEVEL); + dst_net_elm = (network_element_t)xbt_lib_get_or_null(host_lib, dst, ROUTING_HOST_LEVEL); + if(!src_net_elm) src_net_elm = (network_element_t)xbt_lib_get_or_null(as_router_lib, src, ROUTING_ASR_LEVEL); + if(!dst_net_elm) dst_net_elm = (network_element_t)xbt_lib_get_or_null(as_router_lib, dst, ROUTING_ASR_LEVEL); - xbt_assert(src_id, "Network elements %s not found", src); - xbt_assert(dst_id, "Network elements %s not found", dst); + xbt_assert(src_net_elm, "Network elements %s not found", src); + xbt_assert(dst_net_elm, "Network elements %s not found", dst); if(!as->link_table) { + int i,j; /* Create Cost, Predecessor and Link tables */ 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 */ @@ -272,13 +281,13 @@ void model_floyd_parse_route(AS_t rc, const char *src, } } - if(TO_FLOYD_LINK(*src_id, *dst_id)) + if(TO_FLOYD_LINK(src_net_elm->id, dst_net_elm->id)) { if(!route->dst_gateway && !route->src_gateway) XBT_DEBUG("See Route from \"%s\" to \"%s\"", src, dst); else XBT_DEBUG("See ASroute from \"%s(%s)\" to \"%s(%s)\"", src, - route->src_gateway, dst, route->dst_gateway); + route->src_gateway->name, dst, route->dst_gateway->name); char * link_name; unsigned int cpt; xbt_dynar_t link_route_to_test = xbt_dynar_new(global_routing->size_of_link, NULL); @@ -289,9 +298,9 @@ void model_floyd_parse_route(AS_t rc, const char *src, xbt_dynar_push(link_route_to_test,&link); } xbt_assert(!xbt_dynar_compare( - (void*)TO_FLOYD_LINK(*src_id, *dst_id)->link_list, + (void*)TO_FLOYD_LINK(src_net_elm->id, dst_net_elm->id)->link_list, (void*)link_route_to_test, - (int_f_cpvoid_cpvoid_t) surf_pointer_resource_cmp), + (int_f_cpvoid_cpvoid_t) floyd_pointer_resource_cmp), "The route between \"%s\" and \"%s\" already exists", src,dst); } else @@ -300,29 +309,29 @@ void model_floyd_parse_route(AS_t rc, const char *src, XBT_DEBUG("Load Route from \"%s\" to \"%s\"", src, dst); else{ XBT_DEBUG("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", src, - route->src_gateway, dst, route->dst_gateway); - 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(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); + route->src_gateway->name, dst, route->dst_gateway->name); + if(route->dst_gateway->rc_type == SURF_NETWORK_ELEMENT_NULL) + xbt_die("The dst_gateway '%s' does not exist!",route->dst_gateway->name); + if(route->src_gateway->rc_type == SURF_NETWORK_ELEMENT_NULL) + xbt_die("The src_gateway '%s' does not exist!",route->src_gateway->name); } - TO_FLOYD_LINK(*src_id, *dst_id) = + TO_FLOYD_LINK(src_net_elm->id, dst_net_elm->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))->link_list)->used; /* count of links, old model assume 1 */ + TO_FLOYD_PRED(src_net_elm->id, dst_net_elm->id) = src_net_elm->id; + TO_FLOYD_COST(src_net_elm->id, dst_net_elm->id) = + ((TO_FLOYD_LINK(src_net_elm->id, dst_net_elm->id))->link_list)->used; /* count of links, old model assume 1 */ } if( A_surfxml_route_symmetrical == A_surfxml_route_symmetrical_YES || A_surfxml_ASroute_symmetrical == A_surfxml_ASroute_symmetrical_YES ) { - if(TO_FLOYD_LINK(*dst_id, *src_id)) + if(TO_FLOYD_LINK(dst_net_elm->id, src_net_elm->id)) { if(!route->dst_gateway && !route->src_gateway) XBT_DEBUG("See Route from \"%s\" to \"%s\"", dst, src); else XBT_DEBUG("See ASroute from \"%s(%s)\" to \"%s(%s)\"", dst, - route->src_gateway, src, route->dst_gateway); + route->src_gateway->name, src, route->dst_gateway->name); char * link_name; unsigned int i; xbt_dynar_t link_route_to_test = xbt_dynar_new(global_routing->size_of_link, NULL); @@ -334,17 +343,17 @@ void model_floyd_parse_route(AS_t rc, const char *src, xbt_dynar_push(link_route_to_test,&link); } xbt_assert(!xbt_dynar_compare( - (void*)TO_FLOYD_LINK(*dst_id, *src_id)->link_list, + (void*)TO_FLOYD_LINK(dst_net_elm->id, src_net_elm->id)->link_list, (void*)link_route_to_test, - (int_f_cpvoid_cpvoid_t) surf_pointer_resource_cmp), + (int_f_cpvoid_cpvoid_t) floyd_pointer_resource_cmp), "The route between \"%s\" and \"%s\" already exists", src,dst); } else { if(route->dst_gateway && route->src_gateway) { - char *gw_src = xbt_strdup(route->src_gateway); - char *gw_dst = xbt_strdup(route->dst_gateway); + network_element_t gw_src = route->src_gateway; + network_element_t gw_dst = route->dst_gateway; route->src_gateway = gw_dst; route->dst_gateway = gw_src; } @@ -353,13 +362,13 @@ void model_floyd_parse_route(AS_t rc, const char *src, XBT_DEBUG("Load Route from \"%s\" to \"%s\"", dst, src); else XBT_DEBUG("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", dst, - route->src_gateway, src, route->dst_gateway); + route->src_gateway->name, src, route->dst_gateway->name); - TO_FLOYD_LINK(*dst_id, *src_id) = + TO_FLOYD_LINK(dst_net_elm->id, src_net_elm->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))->link_list)->used; /* count of links, old model assume 1 */ + TO_FLOYD_PRED(dst_net_elm->id, src_net_elm->id) = dst_net_elm->id; + TO_FLOYD_COST(dst_net_elm->id, src_net_elm->id) = + ((TO_FLOYD_LINK(dst_net_elm->id, src_net_elm->id))->link_list)->used; /* count of links, old model assume 1 */ } } }