#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");
/* 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;
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, NULL);
+ (xbt_set_elm_t) elm, NULL);
return node;
}
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_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;
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)
if (!found) {
route_t e_route = xbt_new0(s_route_t, 1);
- e_route->link_list = xbt_dynar_new(global_routing->size_of_link, NULL);
+ 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);
}
}
}
static void dijkstra_get_route_and_latency(AS_t as_generic,
- const char *src, const char *dst, route_t route, double *lat);
+ sg_routing_edge_t src, sg_routing_edge_t dst, route_t route, double *lat);
static xbt_dynar_t dijkstra_get_onelink_routes(AS_t as)
{
- 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_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;
+ xbt_dynar_t ret = xbt_dynar_new(sizeof(onelink_t), xbt_free);
+ route_t route = xbt_new0(s_route_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->src_gateway;
+ onelink->dst = route->dst_gateway;
+ }
+ xbt_dynar_push(ret, &onelink);
+ }
+ }
+ }
+ return ret;
}
static void dijkstra_get_route_and_latency(AS_t asg,
- const char *src, const char *dst,
- route_t route, double *lat)
+ sg_routing_edge_t src, sg_routing_edge_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;
graph_node_map_search(as, *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 */
if (src_node_id == dst_node_id) {
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);
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 */
}
/* 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 =
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;
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) {
}
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) {
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, NULL);
+ (xbt_set_elm_t) elm, NULL);
}
if (!as->cached)
AS_t model_dijkstra_both_create(int cached)
{
as_dijkstra_t new_component = (as_dijkstra_t)
- model_generic_create_sized(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;
/* Create the topology graph */
if(!THIS_AS->route_graph)
- THIS_AS->route_graph = xbt_graph_new_graph(1, NULL);
+ 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);
+ THIS_AS->graph_node_map = xbt_dict_new_homogeneous(&graph_node_map_elem_free);
if (THIS_AS->cached && !THIS_AS->route_cache)
- THIS_AS->route_cache = xbt_dict_new_homogeneous(&route_cache_elem_free);
+ 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 */
}
void model_dijkstra_both_parse_route (AS_t asg, const char *src,
- const char *dst, route_t route)
+ const char *dst, route_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_homogeneous(&graph_node_map_elem_free);
-
- if (as->cached && !as->route_cache)
- 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 )
- 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);
- }
-
- route_t e_route = generic_new_extended_route(asg->hierarchy, route, 1);
- route_new_dijkstra(as, *src_id, *dst_id, e_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;
+ 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);
+
+ route_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 ( (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) {
+ sg_routing_edge_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);
+ }
}
