typedef struct s_routing_component_full {
s_as_t generic_routing;
- route_extended_t *routing_table;
+ route_t *routing_table;
} s_routing_component_full_t, *routing_component_full_t;
/* Business methods */
&& dst_id,
"Ask for route \"from\"(%s) or \"to\"(%s) no found in the local table",
k1, k2);
- route_extended_t route = TO_ROUTE_FULL(*src_id, *dst_id);
+ route_t route = TO_ROUTE_FULL(*src_id, *dst_id);
if (route) {
- if (xbt_dynar_length(route->generic_route.link_list) == 1) {
+ if (xbt_dynar_length(route->link_list) == 1) {
void *link =
- *(void **) xbt_dynar_get_ptr(route->generic_route.link_list,
+ *(void **) xbt_dynar_get_ptr(route->link_list,
0);
onelink_t onelink = xbt_new0(s_onelink_t, 1);
onelink->link_ptr = link;
return ret;
}
-static route_extended_t full_get_route(AS_t rc,
- const char *src, const char *dst)
+static void full_get_route_and_latency(AS_t rc,
+ const char *src, const char *dst,
+ route_t res,double *lat)
{
- xbt_assert(rc && src
- && dst,
- "Invalid params for \"get_route\" function at AS \"%s\"",
- rc->name);
/* set utils vars */
routing_component_full_t routing = (routing_component_full_t) rc;
int *src_id = xbt_dict_get_or_null(routing->generic_routing.to_index, src);
int *dst_id = xbt_dict_get_or_null(routing->generic_routing.to_index, dst);
- xbt_assert(src_id
- && dst_id,
- "Ask for route \"from\"(%s) or \"to\"(%s) no found in the local table",
- src, dst);
- route_extended_t e_route = NULL;
- route_extended_t new_e_route = NULL;
+ if (!src_id || !dst_id)
+ THROWF(arg_error,0,"No route from '%s' to '%s'",src,dst);
+
+ route_t e_route = NULL;
void *link;
unsigned int cpt = 0;
e_route = TO_ROUTE_FULL(*src_id, *dst_id);
if (e_route) {
- new_e_route = xbt_new0(s_route_extended_t, 1);
- new_e_route->src_gateway = xbt_strdup(e_route->src_gateway);
- new_e_route->dst_gateway = xbt_strdup(e_route->dst_gateway);
- new_e_route->generic_route.link_list =
- xbt_dynar_new(global_routing->size_of_link, NULL);
- xbt_dynar_foreach(e_route->generic_route.link_list, cpt, link) {
- xbt_dynar_push(new_e_route->generic_route.link_list, &link);
+ res->src_gateway = xbt_strdup(e_route->src_gateway);
+ res->dst_gateway = xbt_strdup(e_route->dst_gateway);
+ xbt_dynar_foreach(e_route->link_list, cpt, link) {
+ xbt_dynar_push(res->link_list, &link);
+ if (lat)
+ *lat += surf_network_model->extension.network.get_link_latency(link);
}
}
- return new_e_route;
}
static void full_finalize(AS_t rc)
/* Delete routing table */
for (i = 0; i < table_size; i++)
for (j = 0; j < table_size; j++)
- generic_free_extended_route(TO_ROUTE_FULL(i, j));
+ generic_free_route(TO_ROUTE_FULL(i, j));
xbt_free(routing->routing_table);
model_generic_finalize(rc);
}
new_component->generic_routing.parse_route = model_full_set_route;
new_component->generic_routing.parse_ASroute = model_full_set_route;
- new_component->generic_routing.get_route = full_get_route;
+ new_component->generic_routing.get_route_and_latency = full_get_route_and_latency;
new_component->generic_routing.get_onelink_routes =
full_get_onelink_routes;
new_component->generic_routing.finalize = full_finalize;
void model_full_end(AS_t current_routing)
{
unsigned int i;
- route_extended_t e_route;
+ route_t e_route;
/* set utils vars */
routing_component_full_t routing =
/* Create table if necessary */
if(!routing->routing_table)
- routing->routing_table = xbt_new0(route_extended_t, table_size * table_size);
+ routing->routing_table = xbt_new0(route_t, table_size * table_size);
/* Add the loopback if needed */
if (current_routing->hierarchy == SURF_ROUTING_BASE) {
for (i = 0; i < table_size; i++) {
e_route = TO_ROUTE_FULL(i, i);
if (!e_route) {
- e_route = xbt_new0(s_route_extended_t, 1);
+ e_route = xbt_new0(s_route_t, 1);
e_route->src_gateway = NULL;
e_route->dst_gateway = NULL;
- e_route->generic_route.link_list =
- xbt_dynar_new(global_routing->size_of_link, NULL);
- xbt_dynar_push(e_route->generic_route.link_list,
+ e_route->link_list = xbt_dynar_new(global_routing->size_of_link, NULL);
+ xbt_dynar_push(e_route->link_list,
&global_routing->loopback);
TO_ROUTE_FULL(i, i) = e_route;
}
}
void model_full_set_route(AS_t rc, const char *src,
- const char *dst, route_extended_t route)
+ const char *dst, route_t route)
{
int *src_id, *dst_id;
src_id = xbt_dict_get_or_null(rc->to_index, src);
xbt_assert(src_id, "Network elements %s not found", src);
xbt_assert(dst_id, "Network elements %s not found", dst);
- xbt_assert(xbt_dynar_length(route->generic_route.link_list) > 0,
+ xbt_assert(!xbt_dynar_is_empty(route->link_list),
"Invalid count of links, must be greater than zero (%s,%s)",
src, dst);
if(!routing->routing_table)
- routing->routing_table = xbt_new0(route_extended_t, table_size * table_size);
+ routing->routing_table = xbt_new0(route_t, table_size * table_size);
if(TO_ROUTE_FULL(*src_id, *dst_id))
{
char * link_name;
unsigned int i;
xbt_dynar_t link_route_to_test = xbt_dynar_new(global_routing->size_of_link, NULL);
- xbt_dynar_foreach(route->generic_route.link_list,i,link_name)
+ xbt_dynar_foreach(route->link_list,i,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_ROUTE_FULL(*src_id, *dst_id)->generic_route.link_list,
+ (void*)TO_ROUTE_FULL(*src_id, *dst_id)->link_list,
(void*)link_route_to_test,
(int_f_cpvoid_cpvoid_t) surf_pointer_resource_cmp),
"The route between \"%s\" and \"%s\" already exists. If you are trying to define a reverse route, you must set the symmetrical=no attribute to your routes tags.", src,dst);
xbt_die("The src_gateway '%s' does not exist!",route->src_gateway);
}
TO_ROUTE_FULL(*src_id, *dst_id) = generic_new_extended_route(rc->hierarchy,route,1);
- xbt_dynar_shrink(TO_ROUTE_FULL(*src_id, *dst_id)->generic_route.link_list, 0);
+ xbt_dynar_shrink(TO_ROUTE_FULL(*src_id, *dst_id)->link_list, 0);
}
if( A_surfxml_route_symmetrical == A_surfxml_route_symmetrical_YES
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--)
+ for(i=xbt_dynar_length(route->link_list) ;i>0 ;i--)
{
- link_name = xbt_dynar_get_as(route->generic_route.link_list,i-1,void *);
+ 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_ROUTE_FULL(*dst_id, *src_id)->generic_route.link_list,
+ (void*)TO_ROUTE_FULL(*dst_id, *src_id)->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);
XBT_DEBUG("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", dst,
route->src_gateway, src, route->dst_gateway);
TO_ROUTE_FULL(*dst_id, *src_id) = generic_new_extended_route(rc->hierarchy,route,0);
- xbt_dynar_shrink(TO_ROUTE_FULL(*dst_id, *src_id)->generic_route.link_list, 0);
+ xbt_dynar_shrink(TO_ROUTE_FULL(*dst_id, *src_id)->link_list, 0);
}
}
-
- if (rc->hierarchy == SURF_ROUTING_BASE) generic_free_route((route_t)route) ;
- else generic_free_extended_route((route_extended_t)route);
}
