#include "surf_routing_private.h"
/* Global vars */
-extern routing_global_t global_routing;
+extern routing_platf_t routing_platf;
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_floyd, surf, "Routing part of surf");
size_t table_size = xbt_dynar_length(asg->index_network_elm);
generic_src_dst_check(asg, 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 */
+ xbt_dynar_t route_stack = xbt_dynar_new(sizeof(route_t), NULL);
+ int pred;
+ int cur = dst->id;
+ do {
+ pred = TO_FLOYD_PRED(src->id, cur);
+ if (pred == -1)
+ THROWF(arg_error, 0, "No route from '%s' to '%s'", src->name, dst->name);
+ xbt_dynar_push_as(route_stack, route_t, TO_FLOYD_LINK(pred, cur));
+ cur = pred;
+ } while (cur != src->id);
- int first = 1;
- int pred = *dst_id;
- int prev_pred = 0;
- sg_routing_edge_t gw_src, gw_dst, prev_gw_src, first_gw;
- unsigned int cpt;
- void *link;
- xbt_dynar_t links;
+ if (asg->hierarchy == SURF_ROUTING_RECURSIVE) {
+ res->src_gateway = xbt_dynar_getlast_as(route_stack, route_t)->src_gateway;
+ res->dst_gateway = xbt_dynar_getfirst_as(route_stack, route_t)->dst_gateway;
+ }
- do {
- prev_pred = pred;
- pred = TO_FLOYD_PRED(*src_id, pred);
- 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->name,
- dst->name);
-
- prev_gw_src = gw_src;
-
- route_t e_route = TO_FLOYD_LINK(pred, prev_pred);
- gw_src = e_route->src_gateway;
- gw_dst = e_route->dst_gateway;
-
- if (first)
- first_gw = gw_dst;
-
- if (asg->hierarchy == SURF_ROUTING_RECURSIVE && !first
- && strcmp(gw_dst->name, prev_gw_src->name)) {
- xbt_dynar_t e_route_as_to_as;
- e_route_as_to_as = xbt_dynar_new(sizeof(sg_routing_link_t), 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);
+ sg_routing_edge_t prev_dst_gw = NULL;
+ while (!xbt_dynar_is_empty(route_stack)) {
+ route_t e_route = xbt_dynar_pop_as(route_stack, route_t);
+ xbt_dynar_t links;
+ sg_routing_link_t link;
+ unsigned int cpt;
+
+ if (asg->hierarchy == SURF_ROUTING_RECURSIVE && prev_dst_gw != NULL
+ && strcmp(prev_dst_gw->name, e_route->src_gateway->name)) {
+ routing_get_route_and_latency(prev_dst_gw, e_route->src_gateway,
+ &res->link_list, lat);
}
links = e_route->link_list;
xbt_dynar_foreach(links, cpt, link) {
- xbt_dynar_unshift(res->link_list, &link);
+ xbt_dynar_push_as(res->link_list, sg_routing_link_t, link);
if (lat)
*lat += surf_network_model->extension.network.get_link_latency(link);
}
- first = 0;
- } while (pred != *src_id);
- 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 = gw_src;
- res->dst_gateway = first_gw;
+ prev_dst_gw = e_route->dst_gateway;
}
+ xbt_dynar_free(&route_stack);
}
static void floyd_finalize(AS_t rc)
}
/* Add the loopback if needed */
- if (global_routing->loopback && current_routing->hierarchy == SURF_ROUTING_BASE) {
+ if (routing_platf->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) {
e_route->src_gateway = NULL;
e_route->dst_gateway = NULL;
e_route->link_list = xbt_dynar_new(sizeof(sg_routing_link_t), NULL);
- xbt_dynar_push(e_route->link_list, &global_routing->loopback);
+ xbt_dynar_push(e_route->link_list, &routing_platf->loopback);
TO_FLOYD_LINK(i, i) = e_route;
TO_FLOYD_PRED(i, i) = i;
TO_FLOYD_COST(i, i) = 1;
size_t table_size = xbt_dynar_length(rc->index_network_elm);
sg_routing_edge_t src_net_elm, dst_net_elm;
- 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);
+ 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);