X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6f0020b4128661d1e48c3313eac227f0b769ed0e..3736e0252d96679e19cfbe41f3c09833d3734386:/src/surf/surf_routing_dijkstra.c diff --git a/src/surf/surf_routing_dijkstra.c b/src/surf/surf_routing_dijkstra.c index 3de1ad191a..778f37d629 100644 --- a/src/surf/surf_routing_dijkstra.c +++ b/src/surf/surf_routing_dijkstra.c @@ -165,13 +165,11 @@ static void add_loopback_dijkstra(as_dijkstra_t as) { } } -static route_t dijkstra_get_route(AS_t as_generic, - const char *src, - const char *dst); +static void dijkstra_get_route_and_latency(AS_t as_generic, + const char *src, const char *dst, route_t route, double *lat); static xbt_dynar_t dijkstra_get_onelink_routes(AS_t as) { - // xbt_die("\"dijkstra_get_onelink_routes\" function not implemented yet"); xbt_dynar_t ret = xbt_dynar_new(sizeof(onelink_t), xbt_free); //size_t table_size = xbt_dict_length(routing->generic_routing.to_index); @@ -179,37 +177,34 @@ static xbt_dynar_t dijkstra_get_onelink_routes(AS_t as) char *k1, *d1, *k2, *d2; xbt_dict_foreach(as->to_index, c1, k1, d1) { xbt_dict_foreach(as->to_index, c2, k2, d2) { - route_t route = dijkstra_get_route(as, k1, k2); - if (route) { - 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 (as->hierarchy == SURF_ROUTING_BASE) { - onelink->src = xbt_strdup(k1); - onelink->dst = xbt_strdup(k2); - } else if (as->hierarchy == - SURF_ROUTING_RECURSIVE) { - onelink->src = xbt_strdup(route->src_gateway); - onelink->dst = xbt_strdup(route->dst_gateway); - } - xbt_dynar_push(ret, &onelink); + route_t route = xbt_new0(s_route_t,1); + route->link_list = xbt_dynar_new(global_routing->size_of_link,NULL); + dijkstra_get_route_and_latency(as, k1, k2,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 (as->hierarchy == SURF_ROUTING_BASE) { + onelink->src = xbt_strdup(k1); + onelink->dst = xbt_strdup(k2); + } else if (as->hierarchy == + SURF_ROUTING_RECURSIVE) { + onelink->src = xbt_strdup(route->src_gateway); + onelink->dst = xbt_strdup(route->dst_gateway); } + xbt_dynar_push(ret, &onelink); } } } return ret; } -static route_t dijkstra_get_route(AS_t asg, - const char *src, - const char *dst) +static void dijkstra_get_route_and_latency(AS_t asg, + const char *src, const char *dst, + route_t route, double *lat) { - xbt_assert(asg && src - && dst, - "Invalid params for \"get_route\" function at AS \"%s\"", - asg->name); /* set utils vars */ as_dijkstra_t as = (as_dijkstra_t) asg; @@ -217,16 +212,8 @@ static route_t dijkstra_get_route(AS_t asg, 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_t new_e_route = xbt_new0(s_route_t, 1); - new_e_route->link_list = xbt_dynar_new(global_routing->size_of_link, NULL); - new_e_route->src_gateway = NULL; - new_e_route->dst_gateway = NULL; + if (!src_id || !dst_id) + THROWF(arg_error,0,"No route from '%s' to '%s'",src,dst); int *pred_arr = NULL; int src_node_id = 0; @@ -246,15 +233,13 @@ static route_t dijkstra_get_route(AS_t asg, graph_node_map_search(as, *src_id); graph_node_map_element_t dst_elm = graph_node_map_search(as, *dst_id); - xbt_assert(src_elm != NULL - && dst_elm != NULL, "src %d or dst %d does not exist", - *src_id, *dst_id); + src_node_id = ((graph_node_data_t) xbt_graph_node_get_data(src_elm->node))->graph_id; dst_node_id = ((graph_node_data_t) xbt_graph_node_get_data(dst_elm->node))->graph_id; - /* if the src and dst are the same *//* fixed, missing in the previous version */ + /* if the src and dst are the same */ if (src_node_id == dst_node_id) { xbt_node_t node_s_v = xbt_dynar_get_as(nodes, src_node_id, xbt_node_t); @@ -262,17 +247,18 @@ static route_t dijkstra_get_route(AS_t asg, xbt_edge_t edge = xbt_graph_get_edge(as->route_graph, node_s_v, node_e_v); - xbt_assert(edge != NULL, "no route between host %d and %d", *src_id, - *dst_id); + if (edge == NULL) + THROWF(arg_error,0,"No route from '%s' to '%s'",src,dst); e_route = (route_t) xbt_graph_edge_get_data(edge); links = e_route->link_list; xbt_dynar_foreach(links, cpt, link) { - xbt_dynar_unshift(new_e_route->link_list, &link); + xbt_dynar_unshift(route->link_list, &link); + if (lat) + *lat += surf_network_model->extension.network.get_link_latency(link); } - return new_e_route; } if (as->cached) { @@ -353,8 +339,8 @@ static route_t dijkstra_get_route(AS_t asg, xbt_edge_t edge = xbt_graph_get_edge(as->route_graph, node_pred_v, node_v); - xbt_assert(edge != NULL, "no route between host %d and %d", *src_id, - *dst_id); + if (edge == NULL) + THROWF(arg_error,0,"No route from '%s' to '%s'",src,dst); prev_gw_src = gw_src; @@ -367,28 +353,32 @@ static route_t dijkstra_get_route(AS_t asg, if (asg->hierarchy == SURF_ROUTING_RECURSIVE && v != dst_node_id && 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); + xbt_dynar_t e_route_as_to_as=NULL; + routing_get_route_and_latency(gw_dst, prev_gw_src,&e_route_as_to_as,NULL); + if (edge == NULL) + THROWF(arg_error,0,"No route from '%s' to '%s'",src,dst); links = e_route_as_to_as; int pos = 0; xbt_dynar_foreach(links, cpt, link) { - xbt_dynar_insert_at(new_e_route->link_list, pos, &link); + xbt_dynar_insert_at(route->link_list, pos, &link); + if (lat) + *lat += surf_network_model->extension.network.get_link_latency(link); pos++; } } links = e_route->link_list; xbt_dynar_foreach(links, cpt, link) { - xbt_dynar_unshift(new_e_route->link_list, &link); + xbt_dynar_unshift(route->link_list, &link); + if (lat) + *lat += surf_network_model->extension.network.get_link_latency(link); } size++; } if (asg->hierarchy == SURF_ROUTING_RECURSIVE) { - new_e_route->src_gateway = xbt_strdup(gw_src); - new_e_route->dst_gateway = xbt_strdup(first_gw); + route->src_gateway = xbt_strdup(gw_src); + route->dst_gateway = xbt_strdup(first_gw); } if (as->cached && elm == NULL) { @@ -402,8 +392,6 @@ static route_t dijkstra_get_route(AS_t asg, if (!as->cached) xbt_free(pred_arr); - - return new_e_route; } static void dijkstra_finalize(AS_t asg) @@ -428,7 +416,7 @@ AS_t model_dijkstra_both_create(int cached) new_component->generic_routing.parse_route = model_dijkstra_both_parse_route; new_component->generic_routing.parse_ASroute = model_dijkstra_both_parse_route; - new_component->generic_routing.get_route = dijkstra_get_route; + new_component->generic_routing.get_route_and_latency = dijkstra_get_route_and_latency; new_component->generic_routing.get_onelink_routes = dijkstra_get_onelink_routes; new_component->generic_routing.finalize = dijkstra_finalize;