X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e4c62e10ed7daa5ecca2506d38979c2adc3f7d23..9f4ddf3b15fccdab0f2666bf44061e7fd8305f49:/src/surf/surf_routing_dijkstra.c diff --git a/src/surf/surf_routing_dijkstra.c b/src/surf/surf_routing_dijkstra.c index 31e59e359e..52d4926efa 100644 --- a/src/surf/surf_routing_dijkstra.c +++ b/src/surf/surf_routing_dijkstra.c @@ -51,11 +51,11 @@ static void graph_node_map_elem_free(void *e) xbt_free(elm); } -static void graph_edge_data_free(void *e) +static void graph_edge_data_free(void *e) // FIXME: useless code dupplication { - route_extended_t e_route = (route_extended_t) e; + route_t e_route = (route_t) e; if (e_route) { - xbt_dynar_free(&(e_route->generic_route.link_list)); + xbt_dynar_free(&(e_route->link_list)); xbt_free(e_route->src_gateway); xbt_free(e_route->dst_gateway); xbt_free(e_route); @@ -79,7 +79,7 @@ static xbt_node_t route_graph_new_node(as_dijkstra_t as, elm = xbt_new0(struct graph_node_map_element, 1); elm->node = node; xbt_dict_set_ext(as->graph_node_map, (char *) (&id), sizeof(int), - (xbt_set_elm_t) elm, &graph_node_map_elem_free); + (xbt_set_elm_t) elm, NULL); return node; } @@ -97,7 +97,7 @@ graph_node_map_search(as_dijkstra_t as, int id) /* Parsing */ static void route_new_dijkstra(as_dijkstra_t as, int src_id, - int dst_id, route_extended_t e_route) + int dst_id, route_t e_route) { XBT_DEBUG("Load Route from \"%d\" to \"%d\"", src_id, dst_id); xbt_node_t src = NULL; @@ -156,25 +156,20 @@ static void add_loopback_dijkstra(as_dijkstra_t as) { } if (!found) { - route_extended_t e_route = xbt_new0(s_route_extended_t, 1); - e_route->src_gateway = NULL; - e_route->dst_gateway = NULL; - e_route->generic_route.link_list = - xbt_dynar_new(global_routing->size_of_link, NULL); - xbt_dynar_push(e_route->generic_route.link_list, + route_t e_route = xbt_new0(s_route_t, 1); + e_route->link_list = xbt_dynar_new(global_routing->size_of_link, NULL); + xbt_dynar_push(e_route->link_list, &global_routing->loopback); xbt_graph_new_edge(as->route_graph, node, node, e_route); } } } -static route_extended_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); @@ -182,38 +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_extended_t route = dijkstra_get_route(as, k1, k2); - if (route) { - if (xbt_dynar_length(route->generic_route.link_list) == 1) { - void *link = - *(void **) xbt_dynar_get_ptr(route->generic_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_extended_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; @@ -221,24 +212,15 @@ static route_extended_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_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; + 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; int dst_node_id = 0; int *nodeid = NULL; int v; - route_extended_t e_route; + route_t e_route; int size = 0; unsigned int cpt; void *link; @@ -251,15 +233,13 @@ static route_extended_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); @@ -267,17 +247,18 @@ static route_extended_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_extended_t) xbt_graph_edge_get_data(edge); + e_route = (route_t) xbt_graph_edge_get_data(edge); - 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(route->link_list, &link); + if (lat) + *lat += surf_network_model->extension.network.get_link_latency(link); } - return new_e_route; } if (as->cached) { @@ -328,9 +309,8 @@ static route_extended_t dijkstra_get_route(AS_t asg, xbt_node_t u_node = xbt_graph_edge_get_target(edge); graph_node_data_t data = xbt_graph_node_get_data(u_node); int u_id = data->graph_id; - route_extended_t tmp_e_route = - (route_extended_t) xbt_graph_edge_get_data(edge); - int cost_v_u = (tmp_e_route->generic_route.link_list)->used; /* count of links, old model assume 1 */ + route_t tmp_e_route = (route_t) xbt_graph_edge_get_data(edge); + int cost_v_u = (tmp_e_route->link_list)->used; /* count of links, old model assume 1 */ if (cost_v_u + cost_arr[*v_id] < cost_arr[u_id]) { pred_arr[u_id] = *v_id; @@ -359,12 +339,12 @@ static route_extended_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; - e_route = (route_extended_t) xbt_graph_edge_get_data(edge); + e_route = (route_t) xbt_graph_edge_get_data(edge); gw_src = e_route->src_gateway; gw_dst = e_route->dst_gateway; @@ -373,29 +353,32 @@ static route_extended_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->generic_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->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(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) { @@ -404,32 +387,24 @@ static route_extended_t dijkstra_get_route(AS_t asg, elm->pred_arr = pred_arr; elm->size = size; xbt_dict_set_ext(as->route_cache, (char *) (&src_id), sizeof(int), - (xbt_set_elm_t) elm, &route_cache_elem_free); + (xbt_set_elm_t) elm, NULL); } if (!as->cached) xbt_free(pred_arr); - - return new_e_route; } static void dijkstra_finalize(AS_t asg) { as_dijkstra_t as = (as_dijkstra_t) asg; - if (as) { - xbt_graph_free_graph(as->route_graph, &xbt_free, - &graph_edge_data_free, &xbt_free); - xbt_dict_free(&as->graph_node_map); - if (as->cached) - xbt_dict_free(&as->route_cache); - /* Delete bypass dict */ - xbt_dict_free(&as->generic_routing.bypassRoutes); - /* Delete index dict */ - xbt_dict_free(&(as->generic_routing.to_index)); - /* Delete structure */ - xbt_free(as); - } + xbt_graph_free_graph(as->route_graph, &xbt_free, + &graph_edge_data_free, &xbt_free); + xbt_dict_free(&as->graph_node_map); + if (as->cached) + xbt_dict_free(&as->route_cache); + + model_generic_finalize(asg); } /* Creation routing model functions */ @@ -441,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; @@ -462,27 +437,27 @@ AS_t model_dijkstracache_create(void) void model_dijkstra_both_end(AS_t as) { - as_dijkstra_t THIS = (as_dijkstra_t) as; + as_dijkstra_t THIS_AS = (as_dijkstra_t) as; xbt_node_t node = NULL; unsigned int cursor2; xbt_dynar_t nodes = NULL; /* Create the topology graph */ - if(!THIS->route_graph) - THIS->route_graph = xbt_graph_new_graph(1, NULL); - if(!THIS->graph_node_map) - THIS->graph_node_map = xbt_dict_new(); + if(!THIS_AS->route_graph) + THIS_AS->route_graph = xbt_graph_new_graph(1, NULL); + if(!THIS_AS->graph_node_map) + THIS_AS->graph_node_map = xbt_dict_new_homogeneous(&graph_node_map_elem_free); - if (THIS->cached && !THIS->route_cache) - THIS->route_cache = xbt_dict_new(); + if (THIS_AS->cached && !THIS_AS->route_cache) + THIS_AS->route_cache = xbt_dict_new_homogeneous(&route_cache_elem_free); /* Add the loopback if needed */ if (as->hierarchy == SURF_ROUTING_BASE) - add_loopback_dijkstra(THIS); + add_loopback_dijkstra(THIS_AS); /* initialize graph indexes in nodes after graph has been built */ - nodes = xbt_graph_get_nodes(THIS->route_graph); + nodes = xbt_graph_get_nodes(THIS_AS->route_graph); xbt_dynar_foreach(nodes, cursor2, node) { graph_node_data_t data = xbt_graph_node_get_data(node); @@ -491,7 +466,7 @@ void model_dijkstra_both_end(AS_t as) } void model_dijkstra_both_parse_route (AS_t asg, const char *src, - const char *dst, route_extended_t route) + const char *dst, route_t route) { as_dijkstra_t as = (as_dijkstra_t) asg; int *src_id, *dst_id; @@ -505,10 +480,10 @@ void model_dijkstra_both_parse_route (AS_t asg, const char *src, if(!as->route_graph) as->route_graph = xbt_graph_new_graph(1, NULL); if(!as->graph_node_map) - as->graph_node_map = xbt_dict_new(); + as->graph_node_map = xbt_dict_new_homogeneous(&graph_node_map_elem_free); if (as->cached && !as->route_cache) - as->route_cache = xbt_dict_new(); + as->route_cache = xbt_dict_new_homogeneous(&route_cache_elem_free); if( A_surfxml_route_symmetrical == A_surfxml_route_symmetrical_YES || A_surfxml_ASroute_symmetrical == A_surfxml_ASroute_symmetrical_YES ) @@ -525,7 +500,6 @@ void model_dijkstra_both_parse_route (AS_t asg, const char *src, xbt_die("The src_gateway '%s' does not exist!",route->src_gateway); } - route_extended_t e_route = - generic_new_extended_route(asg->hierarchy, route, 1); + route_t e_route = generic_new_extended_route(asg->hierarchy, route, 1); route_new_dijkstra(as, *src_id, *dst_id, e_route); }