X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3072be2de56fbf379bb67604b4aef9701cc76244..cc375ad134c19925e1e343bae932be21cf8a8caf:/src/surf/surf_routing_dijkstra.c diff --git a/src/surf/surf_routing_dijkstra.c b/src/surf/surf_routing_dijkstra.c index 0c6c78c627..7d7eac4d63 100644 --- a/src/surf/surf_routing_dijkstra.c +++ b/src/surf/surf_routing_dijkstra.c @@ -7,9 +7,7 @@ #include "surf_routing_private.h" /* Global vars */ -extern routing_global_t global_routing; -extern AS_t current_routing; -extern routing_model_description_t current_routing_model; +extern routing_platf_t routing_platf; XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_dijkstra, surf, "Routing part of surf -- dijkstra routing logic"); @@ -53,13 +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; + sg_platf_route_cbarg_t e_route = (sg_platf_route_cbarg_t) e; if (e_route) { - xbt_dynar_free(&(e_route->generic_route.link_list)); - xbt_free(e_route->src_gateway); - xbt_free(e_route->dst_gateway); + xbt_dynar_free(&(e_route->link_list)); xbt_free(e_route); } } @@ -67,7 +63,7 @@ static void graph_edge_data_free(void *e) /* Utility functions */ static xbt_node_t route_graph_new_node(as_dijkstra_t as, - int id, int graph_id) + int id, int graph_id) { xbt_node_t node = NULL; graph_node_data_t data = NULL; @@ -81,7 +77,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; } @@ -90,29 +86,29 @@ static graph_node_map_element_t graph_node_map_search(as_dijkstra_t as, int id) { graph_node_map_element_t elm = (graph_node_map_element_t) - xbt_dict_get_or_null_ext(as->graph_node_map, - (char *) (&id), - sizeof(int)); + xbt_dict_get_or_null_ext(as->graph_node_map, + (char *) (&id), + sizeof(int)); return elm; } /* Parsing */ static void route_new_dijkstra(as_dijkstra_t as, int src_id, - int dst_id, route_extended_t e_route) + int dst_id, sg_platf_route_cbarg_t e_route) { XBT_DEBUG("Load Route from \"%d\" to \"%d\"", src_id, dst_id); xbt_node_t src = NULL; xbt_node_t dst = NULL; graph_node_map_element_t src_elm = (graph_node_map_element_t) - xbt_dict_get_or_null_ext(as->graph_node_map, - (char *) (&src_id), - sizeof(int)); + xbt_dict_get_or_null_ext(as->graph_node_map, + (char *) (&src_id), + sizeof(int)); graph_node_map_element_t dst_elm = (graph_node_map_element_t) - xbt_dict_get_or_null_ext(as->graph_node_map, - (char *) (&dst_id), - sizeof(int)); + xbt_dict_get_or_null_ext(as->graph_node_map, + (char *) (&dst_id), + sizeof(int)); if (src_elm) @@ -158,89 +154,73 @@ 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, - &global_routing->loopback); + sg_platf_route_cbarg_t e_route = xbt_new0(s_sg_platf_route_cbarg_t, 1); + e_route->link_list = xbt_dynar_new(sizeof(sg_routing_link_t), NULL); + xbt_dynar_push(e_route->link_list, + &routing_platf->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, + sg_routing_edge_t src, sg_routing_edge_t dst, sg_platf_route_cbarg_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_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); - } - } - } - } - return ret; + xbt_dynar_t ret = xbt_dynar_new(sizeof(onelink_t), xbt_free); + sg_platf_route_cbarg_t route = xbt_new0(s_sg_platf_route_cbarg_t,1); + route->link_list = xbt_dynar_new(sizeof(sg_routing_link_t),NULL); + + int src,dst; + sg_routing_edge_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,sg_routing_edge_t); + dst_elm = xbt_dynar_get_as(as->index_network_elm,dst,sg_routing_edge_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); + onelink_t onelink = xbt_new0(s_onelink_t, 1); + onelink->link_ptr = link; + if (as->hierarchy == SURF_ROUTING_BASE) { + onelink->src = src_elm; + onelink->dst = dst_elm; + } else if (as->hierarchy == SURF_ROUTING_RECURSIVE) { + onelink->src = route->gw_src; + onelink->dst = route->gw_dst; + } + 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, + sg_routing_edge_t src, sg_routing_edge_t dst, + sg_platf_route_cbarg_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; 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; + 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->name,dst->name); int *pred_arr = NULL; int src_node_id = 0; int dst_node_id = 0; int *nodeid = NULL; int v; - route_extended_t e_route; + sg_platf_route_cbarg_t e_route; int size = 0; unsigned int cpt; void *link; @@ -253,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; + 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; + 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); @@ -269,24 +247,25 @@ 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->name,dst->name); - e_route = (route_extended_t) xbt_graph_edge_get_data(edge); + e_route = (sg_platf_route_cbarg_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) { /*check if there is a cached predecessor list avail */ elm = (route_cache_element_t) - xbt_dict_get_or_null_ext(as->route_cache, (char *) (&src_id), - sizeof(int)); + xbt_dict_get_or_null_ext(as->route_cache, (char *) (&src_id), + sizeof(int)); } if (elm) { /* cached mode and cache hit */ @@ -330,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 */ + sg_platf_route_cbarg_t tmp_e_route = (sg_platf_route_cbarg_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; @@ -352,7 +330,8 @@ static route_extended_t dijkstra_get_route(AS_t asg, } /* compose route path with links */ - char *gw_src = NULL, *gw_dst = NULL, *prev_gw_src, *first_gw = NULL; + sg_routing_edge_t gw_src = NULL, gw_dst, prev_gw_src, first_gw = NULL; + sg_routing_edge_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 = @@ -361,43 +340,46 @@ 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->name,dst->name); prev_gw_src = gw_src; - e_route = (route_extended_t) xbt_graph_edge_get_data(edge); - gw_src = e_route->src_gateway; - gw_dst = e_route->dst_gateway; + e_route = (sg_platf_route_cbarg_t) xbt_graph_edge_get_data(edge); + gw_src = e_route->gw_src; + gw_dst = e_route->gw_dst; if (v == dst_node_id) first_gw = gw_dst; if (asg->hierarchy == SURF_ROUTING_RECURSIVE && v != dst_node_id - && strcmp(gw_dst, prev_gw_src)) { - xbt_dynar_t e_route_as_to_as = - (*(global_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=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->name,dst->name); 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->gw_src = gw_src; + route->gw_dst = first_gw; } if (as->cached && elm == NULL) { @@ -406,32 +388,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 */ @@ -439,11 +413,11 @@ static void dijkstra_finalize(AS_t asg) AS_t model_dijkstra_both_create(int cached) { as_dijkstra_t new_component = (as_dijkstra_t) - routmod_generic_create(sizeof(s_as_dijkstra_t)); + model_generic_create_sized(sizeof(s_as_dijkstra_t)); 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,30 +436,29 @@ AS_t model_dijkstracache_create(void) return model_dijkstra_both_create(1); } -void model_dijkstra_both_end(void) +void model_dijkstra_both_end(AS_t as) { - as_dijkstra_t routing = - (as_dijkstra_t) current_routing; + 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(!routing->route_graph) - routing->route_graph = xbt_graph_new_graph(1, NULL); - if(!routing->graph_node_map) - routing->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 (routing->cached && !routing->route_cache) - routing->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 (current_routing->hierarchy == SURF_ROUTING_BASE) - add_loopback_dijkstra(routing); + if (routing_platf->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(routing->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); @@ -493,42 +466,73 @@ void model_dijkstra_both_end(void) } } -void model_dijkstra_both_parse_route (AS_t asg, const char *src, - const char *dst, route_extended_t route) +void model_dijkstra_both_parse_route (AS_t asg, sg_platf_route_cbarg_t route) { - 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); - - xbt_assert(src_id, "Network elements %s not found", src); - xbt_assert(dst_id, "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(); - - 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(global_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) - xbt_die("The src_gateway '%s' does not exist!",route->src_gateway); - } - - route_extended_t e_route = - generic_new_extended_route(current_routing->hierarchy, route, 1); - route_new_dijkstra(as, *src_id, *dst_id, e_route); + char *src = (char*)(route->src); + char *dst = (char*)(route->dst); + + int as_route = 0; + if(!route->gw_dst && !route->gw_src) + XBT_DEBUG("Load Route from \"%s\" to \"%s\"", src, dst); + else{ + XBT_DEBUG("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", src, + route->gw_src->name, dst, route->gw_dst->name); + as_route = 1; + if(route->gw_dst->rc_type == SURF_NETWORK_ELEMENT_NULL) + xbt_die("The gw_dst '%s' does not exist!",route->gw_dst->name); + if(route->gw_src->rc_type == SURF_NETWORK_ELEMENT_NULL) + xbt_die("The gw_src '%s' does not exist!",route->gw_src->name); + } + + as_dijkstra_t as = (as_dijkstra_t) asg; + sg_routing_edge_t src_net_elm, dst_net_elm; + + src_net_elm = sg_routing_edge_by_name_or_null(src); + dst_net_elm = sg_routing_edge_by_name_or_null(dst); + + 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_homogeneous(&graph_node_map_elem_free); + + if (as->cached && !as->route_cache) + as->route_cache = xbt_dict_new_homogeneous(&route_cache_elem_free); + + sg_platf_route_cbarg_t e_route = generic_new_extended_route(asg->hierarchy, route, 1); + route_new_dijkstra(as, src_net_elm->id, dst_net_elm->id, e_route); + + // Symmetrical YES + if ( (route->symmetrical == TRUE && as_route == 0) + || (route->symmetrical == TRUE && as_route == 1) + ) + { + if(!route->gw_dst && !route->gw_src) + XBT_DEBUG("Load Route from \"%s\" to \"%s\"", dst, src); + else + XBT_DEBUG("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", dst, + route->gw_dst->name, src, route->gw_src->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->gw_dst && route->gw_src) { + sg_routing_edge_t gw_tmp; + gw_tmp = route->gw_src; + route->gw_src = route->gw_dst; + route->gw_dst = gw_tmp; + } + sg_platf_route_cbarg_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); + } + xbt_dynar_free(&route->link_list); }