/* vars for calculate the floyd algorith. */
int *predecessor_table;
double *cost_table;
- route_extended_t *link_table;
+ route_t *link_table;
} s_as_floyd_t, *as_floyd_t;
-static route_extended_t floyd_get_route(AS_t asg,
- const char *src, const char *dst);
+static void floyd_get_route_and_latency(AS_t asg, const char *src, const char *dst,
+ route_t res, double *lat);
/* Business methods */
static xbt_dynar_t floyd_get_onelink_routes(AS_t asg)
{
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(global_routing->size_of_link, NULL);
+
xbt_dict_cursor_t c1 = NULL, c2 = NULL;
char *k1, *d1, *k2, *d2;
xbt_dict_foreach(asg->to_index, c1, k1, d1) {
xbt_dict_foreach(asg->to_index, c2, k2, d2) {
- route_extended_t route = floyd_get_route(asg, k1, k2);
- if (route) {
- if (xbt_dynar_length(route->generic_route.link_list) == 1) {
- void *link =
- *(void **) xbt_dynar_get_ptr(route->generic_route.link_list,
- 0);
- onelink_t onelink = xbt_new0(s_onelink_t, 1);
- onelink->link_ptr = link;
- if (asg->hierarchy == SURF_ROUTING_BASE) {
- onelink->src = xbt_strdup(k1);
- onelink->dst = xbt_strdup(k2);
- } else if (asg->hierarchy == SURF_ROUTING_RECURSIVE) {
- onelink->src = xbt_strdup(route->src_gateway);
- onelink->dst = xbt_strdup(route->dst_gateway);
- }
- xbt_dynar_push(ret, &onelink);
+ xbt_dynar_reset(route->link_list);
+ floyd_get_route_and_latency(asg, 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 (asg->hierarchy == SURF_ROUTING_BASE) {
+ onelink->src = xbt_strdup(k1);
+ onelink->dst = xbt_strdup(k2);
+ } else if (asg->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;
}
-static route_extended_t floyd_get_route(AS_t asg,
- const char *src, const char *dst)
+static void floyd_get_route_and_latency(AS_t asg, const char *src, const char *dst,
+ route_t res, double *lat)
{
- xbt_assert(asg && src
- && dst,
- "Invalid params for \"get_route\" function at AS \"%s\"",
- asg->name);
/* set utils vars */
as_floyd_t as = (as_floyd_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);
- xbt_assert(src_id
- && dst_id,
- "Ask for route \"from\"(%s) or \"to\"(%s) no found in the local table",
- src, dst);
+ if (src_id == NULL || dst_id == NULL)
+ THROWF(arg_error,0,"No route from '%s' to '%s'",src,dst);
/* create a result route */
- route_extended_t new_e_route = xbt_new0(s_route_extended_t, 1);
- new_e_route->generic_route.link_list =
- xbt_dynar_new(global_routing->size_of_link, NULL);
- new_e_route->src_gateway = NULL;
- new_e_route->dst_gateway = NULL;
int first = 1;
int pred = *dst_id;
prev_gw_src = gw_src;
- route_extended_t e_route = TO_FLOYD_LINK(pred, prev_pred);
+ route_t e_route = TO_FLOYD_LINK(pred, prev_pred);
gw_src = e_route->src_gateway;
gw_dst = e_route->dst_gateway;
if (asg->hierarchy == SURF_ROUTING_RECURSIVE && !first
&& strcmp(gw_dst, prev_gw_src)) {
- xbt_dynar_t e_route_as_to_as =
- routing_get_route(gw_dst, prev_gw_src);
- xbt_assert(e_route_as_to_as, "no route between \"%s\" and \"%s\"",
- gw_dst, prev_gw_src);
+ xbt_dynar_t e_route_as_to_as;
+ e_route_as_to_as = xbt_dynar_new(global_routing->size_of_link, NULL);
+ routing_get_route_and_latency(gw_dst, prev_gw_src,&e_route_as_to_as,NULL);
links = e_route_as_to_as;
int pos = 0;
xbt_dynar_foreach(links, cpt, link) {
- xbt_dynar_insert_at(new_e_route->generic_route.link_list, pos,
- &link);
+ xbt_dynar_insert_at(res->link_list, pos, &link);
+ if (lat)
+ *lat += surf_network_model->extension.network.get_link_latency(link);
pos++;
}
+ xbt_dynar_free(&e_route_as_to_as);
}
- links = e_route->generic_route.link_list;
+ links = e_route->link_list;
xbt_dynar_foreach(links, cpt, link) {
- xbt_dynar_unshift(new_e_route->generic_route.link_list, &link);
+ xbt_dynar_unshift(res->link_list, &link);
+ if (lat)
+ *lat += surf_network_model->extension.network.get_link_latency(link);
}
first = 0;
} while (pred != *src_id);
- xbt_assert(pred != -1, "no route from host %d to %d (\"%s\" to \"%s\")",
- *src_id, *dst_id, src, dst);
+ if (pred == -1)
+ THROWF(arg_error,0,"No route from '%s' to '%s'",src,dst);
if (asg->hierarchy == SURF_ROUTING_RECURSIVE) {
- new_e_route->src_gateway = xbt_strdup(gw_src);
- new_e_route->dst_gateway = xbt_strdup(first_gw);
+ res->src_gateway = xbt_strdup(gw_src);
+ res->dst_gateway = xbt_strdup(first_gw);
}
-
- return new_e_route;
}
static void floyd_finalize(AS_t rc)
/* Delete link_table */
for (i = 0; i < table_size; i++)
for (j = 0; j < table_size; j++)
- generic_free_extended_route(TO_FLOYD_LINK(i, j));
+ generic_free_route(TO_FLOYD_LINK(i, j));
xbt_free(as->link_table);
/* Delete bypass dict */
xbt_dict_free(&as->generic_routing.bypassRoutes);
/* Delete index dict */
xbt_dict_free(&(as->generic_routing.to_index));
- /* Delete dictionary index dict, predecessor and links table */
+ /* Delete predecessor and cost table */
xbt_free(as->predecessor_table);
- /* Delete structure */
- xbt_free(rc);
+ xbt_free(as->cost_table);
+
+ model_generic_finalize(rc);
}
}
as_floyd_t new_component = (as_floyd_t)model_generic_create_sized(sizeof(s_as_floyd_t));
new_component->generic_routing.parse_route = model_floyd_parse_route;
new_component->generic_routing.parse_ASroute = model_floyd_parse_route;
- new_component->generic_routing.get_route = floyd_get_route;
+ new_component->generic_routing.get_route_and_latency = floyd_get_route_and_latency;
new_component->generic_routing.get_onelink_routes =
floyd_get_onelink_routes;
new_component->generic_routing.finalize = floyd_finalize;
/* 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 */
+ as->link_table = xbt_new0(route_t, table_size * table_size); /* actual link between src and dst */
/* Initialize costs and predecessors */
for (i = 0; i < table_size; i++)
}
/* Add the loopback if needed */
- if (current_routing->hierarchy == SURF_ROUTING_BASE) {
+ if (global_routing->loopback && current_routing->hierarchy == SURF_ROUTING_BASE) {
for (i = 0; i < table_size; i++) {
- route_extended_t e_route = TO_FLOYD_LINK(i, i);
+ route_t e_route = TO_FLOYD_LINK(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 =
+ e_route->link_list =
xbt_dynar_new(global_routing->size_of_link, NULL);
- xbt_dynar_push(e_route->generic_route.link_list,
- &global_routing->loopback);
+ xbt_dynar_push(e_route->link_list, &global_routing->loopback);
TO_FLOYD_LINK(i, i) = e_route;
TO_FLOYD_PRED(i, i) = i;
TO_FLOYD_COST(i, i) = 1;
}
}
-static int surf_pointer_resource_cmp(const void *a, const void *b) {
+static int floyd_pointer_resource_cmp(const void *a, const void *b) {
return a != b;
}
//FIXME: kill dupplicates in next function with full routing
void model_floyd_parse_route(AS_t rc, const char *src,
- const char *dst, route_extended_t route)
+ const char *dst, route_t route)
{
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);
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(route_extended_t, table_size * table_size); /* actual link between src and dst */
+ as->link_table = xbt_new0(route_t, table_size * table_size); /* actual link between src and dst */
/* Initialize costs and predecessors */
for (i = 0; i < table_size; i++)
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)
+ 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_id, *dst_id)->generic_route.link_list,
+ (void*)TO_FLOYD_LINK(*src_id, *dst_id)->link_list,
(void*)link_route_to_test,
- (int_f_cpvoid_cpvoid_t) surf_pointer_resource_cmp),
+ (int_f_cpvoid_cpvoid_t) floyd_pointer_resource_cmp),
"The route between \"%s\" and \"%s\" already exists", src,dst);
}
else
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 */
+ ((TO_FLOYD_LINK(*src_id, *dst_id))->link_list)->used; /* count of links, old model assume 1 */
}
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_FLOYD_LINK(*dst_id, *src_id)->generic_route.link_list,
+ (void*)TO_FLOYD_LINK(*dst_id, *src_id)->link_list,
(void*)link_route_to_test,
- (int_f_cpvoid_cpvoid_t) surf_pointer_resource_cmp),
+ (int_f_cpvoid_cpvoid_t) floyd_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);
+ char *gw_src = route->src_gateway;
+ char *gw_dst = route->dst_gateway;
route->src_gateway = gw_dst;
route->dst_gateway = gw_src;
}
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 */
+ ((TO_FLOYD_LINK(*dst_id, *src_id))->link_list)->used; /* count of links, old model assume 1 */
}
}
}
