#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_dijkstra, surf, "Routing part of surf -- dijkstra routing logic");
route_t e_route = (route_t) e;
if (e_route) {
xbt_dynar_free(&(e_route->link_list));
- xbt_free(e_route->src_gateway);
- xbt_free(e_route->dst_gateway);
xbt_free(e_route);
}
}
route_t e_route = xbt_new0(s_route_t, 1);
e_route->link_list = xbt_dynar_new(sizeof(sg_routing_link_t), NULL);
xbt_dynar_push(e_route->link_list,
- &global_routing->loopback);
+ &routing_platf->loopback);
xbt_graph_new_edge(as->route_graph, node, node, e_route);
}
}
THIS_AS->route_cache = xbt_dict_new_homogeneous(&route_cache_elem_free);
/* Add the loopback if needed */
- if (global_routing->loopback && as->hierarchy == SURF_ROUTING_BASE)
+ if (routing_platf->loopback && as->hierarchy == SURF_ROUTING_BASE)
add_loopback_dijkstra(THIS_AS);
/* initialize graph indexes in nodes after graph has been built */
as_dijkstra_t as = (as_dijkstra_t) asg;
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);