- as_floyd_t as = (as_floyd_t) rc;
-
- /* set the size of table routing */
- size_t table_size = xbt_dict_length(rc->to_index);
- int *src_id, *dst_id;
- int i,j;
-
- src_id = xbt_dict_get_or_null(rc->to_index, src);
- dst_id = xbt_dict_get_or_null(rc->to_index, dst);
-
- xbt_assert(src_id, "Network elements %s not found", src);
- xbt_assert(dst_id, "Network elements %s not found", dst);
-
- if(!as->link_table)
- {
- /* Create Cost, Predecessor and Link tables */
- as->cost_table = xbt_new0(double, table_size * table_size); /* link cost from host to host */
- as->predecessor_table = xbt_new0(int, table_size * table_size); /* predecessor host numbers */
- as->link_table = xbt_new0(route_extended_t, table_size * table_size); /* actual link between src and dst */
-
- /* Initialize costs and predecessors */
- for (i = 0; i < table_size; i++)
- for (j = 0; j < table_size; j++) {
- TO_FLOYD_COST(i, j) = DBL_MAX;
- TO_FLOYD_PRED(i, j) = -1;
- TO_FLOYD_LINK(i, j) = NULL; /* fixed, missing in the previous version */
- }
- }
-
- if(TO_FLOYD_LINK(*src_id, *dst_id))
- {
- if(!route->dst_gateway && !route->src_gateway)
- XBT_DEBUG("See Route from \"%s\" to \"%s\"", src, dst);
- else
- XBT_DEBUG("See ASroute from \"%s(%s)\" to \"%s(%s)\"", src,
- route->src_gateway, dst, route->dst_gateway);
- char * link_name;
- unsigned int cpt;
- xbt_dynar_t link_route_to_test = xbt_dynar_new(global_routing->size_of_link, NULL);
- xbt_dynar_foreach(route->generic_route.link_list,cpt,link_name)
- {
- void *link = xbt_lib_get_or_null(link_lib, link_name, SURF_LINK_LEVEL);
- xbt_assert(link,"Link : '%s' doesn't exists.",link_name);
- xbt_dynar_push(link_route_to_test,&link);
- }
- xbt_assert(!xbt_dynar_compare(
- (void*)TO_FLOYD_LINK(*src_id, *dst_id)->generic_route.link_list,
- (void*)link_route_to_test,
- (int_f_cpvoid_cpvoid_t) surf_pointer_resource_cmp),
- "The route between \"%s\" and \"%s\" already exists", src,dst);
- }
- else
- {
- 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);
- }
- TO_FLOYD_LINK(*src_id, *dst_id) =
- generic_new_extended_route(rc->hierarchy, route, 1);
- TO_FLOYD_PRED(*src_id, *dst_id) = *src_id;
- TO_FLOYD_COST(*src_id, *dst_id) =
- ((TO_FLOYD_LINK(*src_id, *dst_id))->generic_route.link_list)->used; /* count of links, old model assume 1 */
- }
-
- if( A_surfxml_route_symmetrical == A_surfxml_route_symmetrical_YES
- || A_surfxml_ASroute_symmetrical == A_surfxml_ASroute_symmetrical_YES )
- {
- if(TO_FLOYD_LINK(*dst_id, *src_id))
- {
- if(!route->dst_gateway && !route->src_gateway)
- XBT_DEBUG("See Route from \"%s\" to \"%s\"", dst, src);
- else
- XBT_DEBUG("See ASroute from \"%s(%s)\" to \"%s(%s)\"", dst,
- route->src_gateway, src, route->dst_gateway);
- char * link_name;
- unsigned int i;
- xbt_dynar_t link_route_to_test = xbt_dynar_new(global_routing->size_of_link, NULL);
- for(i=xbt_dynar_length(route->generic_route.link_list) ;i>0 ;i--)
- {
- link_name = xbt_dynar_get_as(route->generic_route.link_list,i-1,void *);
- void *link = xbt_lib_get_or_null(link_lib, link_name, SURF_LINK_LEVEL);
- xbt_assert(link,"Link : '%s' doesn't exists.",link_name);
- xbt_dynar_push(link_route_to_test,&link);
- }
- xbt_assert(!xbt_dynar_compare(
- (void*)TO_FLOYD_LINK(*dst_id, *src_id)->generic_route.link_list,
- (void*)link_route_to_test,
- (int_f_cpvoid_cpvoid_t) surf_pointer_resource_cmp),
- "The route between \"%s\" and \"%s\" already exists", src,dst);
- }
- else
- {
- if(route->dst_gateway && route->src_gateway)
- {
- char *gw_src = xbt_strdup(route->src_gateway);
- char *gw_dst = xbt_strdup(route->dst_gateway);
- route->src_gateway = gw_dst;
- route->dst_gateway = gw_src;
- }
-
- 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->src_gateway, src, route->dst_gateway);
-
- TO_FLOYD_LINK(*dst_id, *src_id) =
- generic_new_extended_route(rc->hierarchy, route, 0);
- TO_FLOYD_PRED(*dst_id, *src_id) = *dst_id;
- TO_FLOYD_COST(*dst_id, *src_id) =
- ((TO_FLOYD_LINK(*dst_id, *src_id))->generic_route.link_list)->used; /* count of links, old model assume 1 */
- }
- }
+ char *src = (char*)(route->src);
+ char *dst = (char*)(route->dst);
+
+ int as_route = 0;
+ as_floyd_t as = (as_floyd_t) rc;
+
+ /* set the size of table routing */
+ size_t table_size = xbt_dynar_length(rc->index_network_elm);
+ 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);
+
+ if(!as->link_table)
+ {
+ int i,j;
+ /* Create Cost, Predecessor and Link tables */
+ as->cost_table = xbt_new0(double, table_size * table_size); /* link cost from host to host */
+ as->predecessor_table = xbt_new0(int, table_size * table_size); /* predecessor host numbers */
+ as->link_table = xbt_new0(sg_platf_route_cbarg_t, table_size * table_size); /* actual link between src and dst */
+
+ /* Initialize costs and predecessors */
+ for (i = 0; i < table_size; i++)
+ for (j = 0; j < table_size; j++) {
+ TO_FLOYD_COST(i, j) = DBL_MAX;
+ TO_FLOYD_PRED(i, j) = -1;
+ TO_FLOYD_LINK(i, j) = NULL; /* fixed, missing in the previous version */
+ }
+ }
+ if(!route->gw_dst && !route->gw_src)
+ XBT_DEBUG("Load Route from \"%s\" to \"%s\"", src, dst);
+ else{
+ as_route = 1;
+ XBT_DEBUG("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", src,
+ route->gw_src->name, dst, route->gw_dst->name);
+ if(route->gw_dst->rc_type == SURF_NETWORK_ELEMENT_NULL)
+ xbt_die("The dst_gateway '%s' does not exist!",route->gw_dst->name);
+ if(route->gw_src->rc_type == SURF_NETWORK_ELEMENT_NULL)
+ xbt_die("The src_gateway '%s' does not exist!",route->gw_src->name);
+ }
+
+ if(TO_FLOYD_LINK(src_net_elm->id, dst_net_elm->id))
+ {
+
+ char * link_name;
+ unsigned int cpt;
+ xbt_dynar_t link_route_to_test = xbt_dynar_new(sizeof(sg_routing_link_t), NULL);
+ xbt_dynar_foreach(route->link_list,cpt,link_name)
+ {
+ void *link = xbt_lib_get_or_null(link_lib, link_name, SURF_LINK_LEVEL);
+ xbt_assert(link,"Link : '%s' doesn't exists.",link_name);
+ xbt_dynar_push(link_route_to_test,&link);
+ }
+ xbt_assert(!xbt_dynar_compare(
+ (void*)TO_FLOYD_LINK(src_net_elm->id, dst_net_elm->id)->link_list,
+ (void*)link_route_to_test,
+ (int_f_cpvoid_cpvoid_t) floyd_pointer_resource_cmp),
+ "The route between \"%s\" and \"%s\" already exists", src,dst);
+ }
+ else
+ {
+ TO_FLOYD_LINK(src_net_elm->id, dst_net_elm->id) =
+ generic_new_extended_route(rc->hierarchy, route, 1);
+ TO_FLOYD_PRED(src_net_elm->id, dst_net_elm->id) = src_net_elm->id;
+ TO_FLOYD_COST(src_net_elm->id, dst_net_elm->id) =
+ ((TO_FLOYD_LINK(src_net_elm->id, dst_net_elm->id))->link_list)->used; /* count of links, old model assume 1 */
+ }
+
+ if ( (route->symmetrical == TRUE && as_route == 0)
+ || (route->symmetrical == TRUE && as_route == 1)
+ )
+ {
+ if(TO_FLOYD_LINK(dst_net_elm->id, src_net_elm->id))
+ {
+ if(!route->gw_dst && !route->gw_src)
+ XBT_DEBUG("See Route from \"%s\" to \"%s\"", dst, src);
+ else
+ XBT_DEBUG("See ASroute from \"%s(%s)\" to \"%s(%s)\"", dst,
+ route->gw_src->name, src, route->gw_dst->name);
+ char * link_name;
+ unsigned int i;
+ xbt_dynar_t link_route_to_test = xbt_dynar_new(sizeof(sg_routing_link_t), NULL);
+ for(i=xbt_dynar_length(route->link_list) ;i>0 ;i--)
+ {
+ link_name = xbt_dynar_get_as(route->link_list,i-1,void *);
+ void *link = xbt_lib_get_or_null(link_lib, link_name, SURF_LINK_LEVEL);
+ xbt_assert(link,"Link : '%s' doesn't exists.",link_name);
+ xbt_dynar_push(link_route_to_test,&link);
+ }
+ xbt_assert(!xbt_dynar_compare(
+ (void*)TO_FLOYD_LINK(dst_net_elm->id, src_net_elm->id)->link_list,
+ (void*)link_route_to_test,
+ (int_f_cpvoid_cpvoid_t) floyd_pointer_resource_cmp),
+ "The route between \"%s\" and \"%s\" already exists", src,dst);
+ }
+ else
+ {
+ if(route->gw_dst && route->gw_src)
+ {
+ sg_routing_edge_t gw_src = route->gw_src;
+ sg_routing_edge_t gw_dst = route->gw_dst;
+ route->gw_src = gw_dst;
+ route->gw_dst = gw_src;
+ }
+
+ if(!route->gw_src && !route->gw_dst)
+ XBT_DEBUG("Load Route from \"%s\" to \"%s\"", dst, src);
+ else
+ XBT_DEBUG("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", dst,
+ route->gw_src->name, src, route->gw_dst->name);
+
+ TO_FLOYD_LINK(dst_net_elm->id, src_net_elm->id) =
+ generic_new_extended_route(rc->hierarchy, route, 0);
+ TO_FLOYD_PRED(dst_net_elm->id, src_net_elm->id) = dst_net_elm->id;
+ TO_FLOYD_COST(dst_net_elm->id, src_net_elm->id) =
+ ((TO_FLOYD_LINK(dst_net_elm->id, src_net_elm->id))->link_list)->used; /* count of links, old model assume 1 */
+ }
+ }
+ xbt_dynar_free(&route->link_list);