X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/29399b5261c3ff1e181eb75ee32d00aafeef5b26..b5d888de40aaeeec3757922455f920b5333dbc6e:/src/surf/surf_routing_dijkstra.c diff --git a/src/surf/surf_routing_dijkstra.c b/src/surf/surf_routing_dijkstra.c index 3c98c82291..2736aa9f32 100644 --- a/src/surf/surf_routing_dijkstra.c +++ b/src/surf/surf_routing_dijkstra.c @@ -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; } @@ -165,35 +165,35 @@ static void add_loopback_dijkstra(as_dijkstra_t as) { } } -static void dijkstra_get_route(AS_t as_generic, - const char *src, const char *dst, route_t route); +static void dijkstra_get_route_and_latency(AS_t as_generic, + network_element_t src, network_element_t 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); - xbt_dict_cursor_t c1 = NULL, c2 = NULL; - 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 = xbt_new0(s_route_t,1); - route->link_list = xbt_dynar_new(global_routing->size_of_link,NULL); - dijkstra_get_route(as, k1, k2,route); + route_t route = xbt_new0(s_route_t,1); + route->link_list = xbt_dynar_new(global_routing->size_of_link,NULL); + + int src,dst; + network_element_t src_elm, dst_elm; + size_t table_size = xbt_dynar_length(as->index_network_elm); + for(src=0; src < table_size; src++) { + for(dst=0; dst< table_size; dst++) { + xbt_dynar_reset(route->link_list); + src_elm = xbt_dynar_get_as(as->index_network_elm,src,network_element_t); + dst_elm = xbt_dynar_get_as(as->index_network_elm,dst,network_element_t); + dijkstra_get_route_and_latency(as, 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); + 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); + onelink->src = src_elm; + onelink->dst = dst_elm; + } else if (as->hierarchy == SURF_ROUTING_RECURSIVE) { + onelink->src = route->src_gateway; + onelink->dst = route->dst_gateway; } xbt_dynar_push(ret, &onelink); } @@ -202,19 +202,20 @@ static xbt_dynar_t dijkstra_get_onelink_routes(AS_t as) return ret; } -static void dijkstra_get_route(AS_t asg, - const char *src, const char *dst, - route_t route) +static void dijkstra_get_route_and_latency(AS_t asg, + network_element_t src, network_element_t dst, + route_t route, double *lat) { /* set utils vars */ as_dijkstra_t as = (as_dijkstra_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); + int *src_id = &(src->id); + int *dst_id = &(dst->id); + if (!src_id || !dst_id) - THROWF(arg_error,0,"No route from '%s' to '%s'",src,dst); + THROWF(arg_error,0,"No route from '%s' to '%s'",src->name,dst->name); int *pred_arr = NULL; int src_node_id = 0; @@ -249,13 +250,15 @@ static void dijkstra_get_route(AS_t asg, xbt_graph_get_edge(as->route_graph, node_s_v, node_e_v); if (edge == NULL) - THROWF(arg_error,0,"No route from '%s' to '%s'",src,dst); + THROWF(arg_error,0,"No route from '%s' to '%s'",src->name,dst->name); e_route = (route_t) xbt_graph_edge_get_data(edge); links = e_route->link_list; xbt_dynar_foreach(links, cpt, link) { xbt_dynar_unshift(route->link_list, &link); + if (lat) + *lat += surf_network_model->extension.network.get_link_latency(link); } } @@ -329,7 +332,8 @@ static void dijkstra_get_route(AS_t asg, } /* compose route path with links */ - char *gw_src = NULL, *gw_dst = NULL, *prev_gw_src, *first_gw = NULL; + network_element_t gw_src = NULL, gw_dst, prev_gw_src, first_gw = NULL; + network_element_t gw_dst_net_elm = NULL, prev_gw_src_net_elm = NULL; for (v = dst_node_id; v != src_node_id; v = pred_arr[v]) { xbt_node_t node_pred_v = @@ -339,7 +343,7 @@ static void dijkstra_get_route(AS_t asg, xbt_graph_get_edge(as->route_graph, node_pred_v, node_v); if (edge == NULL) - THROWF(arg_error,0,"No route from '%s' to '%s'",src,dst); + THROWF(arg_error,0,"No route from '%s' to '%s'",src->name,dst->name); prev_gw_src = gw_src; @@ -351,15 +355,17 @@ static void dijkstra_get_route(AS_t asg, first_gw = gw_dst; if (asg->hierarchy == SURF_ROUTING_RECURSIVE && v != dst_node_id - && strcmp(gw_dst, prev_gw_src)) { + && strcmp(gw_dst->name, prev_gw_src->name)) { 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); + routing_get_route_and_latency(gw_dst_net_elm, prev_gw_src_net_elm, &e_route_as_to_as, NULL); if (edge == NULL) - THROWF(arg_error,0,"No route from '%s' to '%s'",src,dst); + THROWF(arg_error,0,"No route from '%s' to '%s'",src->name,dst->name); links = e_route_as_to_as; int pos = 0; xbt_dynar_foreach(links, cpt, link) { xbt_dynar_insert_at(route->link_list, pos, &link); + if (lat) + *lat += surf_network_model->extension.network.get_link_latency(link); pos++; } } @@ -367,13 +373,15 @@ static void dijkstra_get_route(AS_t asg, links = e_route->link_list; xbt_dynar_foreach(links, cpt, 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) { - route->src_gateway = xbt_strdup(gw_src); - route->dst_gateway = xbt_strdup(first_gw); + route->src_gateway = gw_src; + route->dst_gateway = first_gw; } if (as->cached && elm == NULL) { @@ -382,7 +390,7 @@ static void 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) @@ -411,7 +419,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; @@ -432,27 +440,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); + if (global_routing->loopback && as->hierarchy == SURF_ROUTING_BASE) + 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); @@ -463,38 +471,71 @@ void model_dijkstra_both_end(AS_t as) void model_dijkstra_both_parse_route (AS_t asg, const char *src, const char *dst, route_t route) { + int as_route = 0; + if(!route->dst_gateway && !route->src_gateway) + 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->name, dst, route->dst_gateway->name); + as_route = 1; + 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); + } + as_dijkstra_t as = (as_dijkstra_t) asg; - int *src_id, *dst_id; - src_id = xbt_dict_get_or_null(asg->to_index, src); - dst_id = xbt_dict_get_or_null(asg->to_index, dst); + network_element_t src_net_elm, dst_net_elm; - xbt_assert(src_id, "Network elements %s not found", src); - xbt_assert(dst_id, "Network elements %s not found", dst); + src_net_elm = xbt_lib_get_or_null(host_lib, src, ROUTING_HOST_LEVEL); + dst_net_elm = xbt_lib_get_or_null(host_lib, dst, ROUTING_HOST_LEVEL); + if (!src_net_elm) + src_net_elm = xbt_lib_get_or_null(as_router_lib, src, ROUTING_ASR_LEVEL); + if (!dst_net_elm) + dst_net_elm = xbt_lib_get_or_null(as_router_lib, dst, ROUTING_ASR_LEVEL); + + xbt_assert(src_net_elm, "Network elements %s not found", src); + xbt_assert(dst_net_elm, "Network elements %s not found", dst); /* Create the topology graph */ 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(); - - if( A_surfxml_route_symmetrical == A_surfxml_route_symmetrical_YES - || A_surfxml_ASroute_symmetrical == A_surfxml_ASroute_symmetrical_YES ) - xbt_die("Route symmetrical not supported on model dijkstra"); - - if(!route->dst_gateway && !route->src_gateway) - 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); - } + as->route_cache = xbt_dict_new_homogeneous(&route_cache_elem_free); route_t e_route = generic_new_extended_route(asg->hierarchy, route, 1); - route_new_dijkstra(as, *src_id, *dst_id, e_route); + route_new_dijkstra(as, src_net_elm->id, dst_net_elm->id, e_route); + + // Symmetrical YES + if ( (A_surfxml_route_symmetrical == A_surfxml_route_symmetrical_YES && as_route == 0) + || (A_surfxml_ASroute_symmetrical == A_surfxml_ASroute_symmetrical_YES && as_route == 1) + ) + { + if(!route->dst_gateway && !route->src_gateway) + XBT_DEBUG("Load Route from \"%s\" to \"%s\"", dst, src); + else + XBT_DEBUG("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", dst, + route->dst_gateway->name, src, route->src_gateway->name); + + xbt_dynar_t nodes = xbt_graph_get_nodes(as->route_graph); + xbt_node_t node_s_v = xbt_dynar_get_as(nodes, src_net_elm->id, xbt_node_t); + xbt_node_t node_e_v = xbt_dynar_get_as(nodes, dst_net_elm->id, xbt_node_t); + xbt_edge_t edge = + xbt_graph_get_edge(as->route_graph, node_e_v, node_s_v); + + if (edge) + THROWF(arg_error,0,"(AS)Route from '%s' to '%s' already exists",src,dst); + + if (route->dst_gateway && route->src_gateway) { + network_element_t gw_tmp; + gw_tmp = route->src_gateway; + route->src_gateway = route->dst_gateway; + route->dst_gateway = gw_tmp; + } + route_t link_route_back = generic_new_extended_route(asg->hierarchy, route, 0); + route_new_dijkstra(as, dst_net_elm->id, src_net_elm->id, link_route_back); + } }