static xbt_dynar_t dijkstra_get_onelink_routes(AS_t as)
{
xbt_dynar_t ret = xbt_dynar_new(sizeof(onelink_t), xbt_free);
- THROW_UNIMPLEMENTED;
-// //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 = route->src_gateway;
-// onelink->dst = route->dst_gateway;
-// }
-// xbt_dynar_push(ret, &onelink);
-// }
-// }
-// }
+ 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);
+ 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;
}
}
/* compose route path with links */
- network_element_t gw_src, gw_dst, prev_gw_src, first_gw;
+ 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]) {
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;
network_element_t src_net_elm, dst_net_elm;
- src_net_elm = (network_element_t)xbt_lib_get_or_null(host_lib, src, ROUTING_HOST_LEVEL);
- dst_net_elm = (network_element_t)xbt_lib_get_or_null(host_lib, dst, ROUTING_HOST_LEVEL);
- if(!src_net_elm) src_net_elm = (network_element_t)xbt_lib_get_or_null(as_router_lib, src, ROUTING_ASR_LEVEL);
- if(!dst_net_elm) dst_net_elm = (network_element_t)xbt_lib_get_or_null(as_router_lib, dst, ROUTING_ASR_LEVEL);
+ 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);
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->name, dst, route->dst_gateway->name);
- 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);
- }
-
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) {
+ 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);
+ }
}