XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_routing_generic, surf_route, "Generic implementation of the surf routing");
+static int having_set_bypassroute = 0;
+
AS_t model_generic_create_sized(size_t childsize) {
AS_t new_component = model_none_create_sized(childsize);
new_component->parse_route = NULL;
new_component->parse_ASroute = NULL;
new_component->parse_bypassroute = generic_parse_bypassroute;
- new_component->get_route = NULL;
- new_component->get_latency = generic_get_link_latency;
+ new_component->get_route_and_latency = NULL;
new_component->get_onelink_routes = NULL;
new_component->get_bypass_route =
generic_get_bypassroute;
new_component->finalize = model_generic_finalize;
- new_component->to_index = xbt_dict_new();
- new_component->bypassRoutes = xbt_dict_new();
+ new_component->to_index = xbt_dict_new_homogeneous(xbt_free);
+ new_component->bypassRoutes = xbt_dict_new_homogeneous((void (*)(void *)) generic_free_route);
return new_component;
}
xbt_dict_t _to_index;
_to_index = as->to_index;
*id = xbt_dict_length(_to_index);
- xbt_dict_set(_to_index, name, id, xbt_free);
+ xbt_dict_set(_to_index, name, id, NULL);
}
void generic_parse_AS(AS_t as, const char *name)
xbt_dict_t _to_index;
_to_index = as->to_index;
*id = xbt_dict_length(_to_index);
- xbt_dict_set(_to_index, name, id, xbt_free);
+ xbt_dict_set(_to_index, name, id, NULL);
}
void generic_parse_bypassroute(AS_t rc,
const char *src, const char *dst,
- route_extended_t e_route)
+ route_t e_route)
{
XBT_DEBUG("Load bypassRoute from \"%s\" to \"%s\"", src, dst);
xbt_dict_t dict_bypassRoutes = rc->bypassRoutes;
char *route_name;
route_name = bprintf("%s#%s", src, dst);
- xbt_assert(xbt_dynar_length(e_route->generic_route.link_list) > 0,
+ xbt_assert(!xbt_dynar_is_empty(e_route->link_list),
"Invalid count of links, must be greater than zero (%s,%s)",
src, dst);
xbt_assert(!xbt_dict_get_or_null(dict_bypassRoutes, route_name),
"The bypass route between \"%s\"(\"%s\") and \"%s\"(\"%s\") already exists",
src, e_route->src_gateway, dst, e_route->dst_gateway);
- route_extended_t new_e_route =
+ route_t new_e_route =
generic_new_extended_route(SURF_ROUTING_RECURSIVE, e_route, 0);
- xbt_dynar_free(&(e_route->generic_route.link_list));
+ xbt_dynar_free(&(e_route->link_list));
xbt_free(e_route);
- xbt_dict_set(dict_bypassRoutes, route_name, new_e_route,
- (void (*)(void *)) generic_free_extended_route);
+ xbt_dict_set(dict_bypassRoutes, route_name, new_e_route, NULL);
+ having_set_bypassroute = 1;
xbt_free(route_name);
}
/* ************************************************************************** */
/* *********************** GENERIC BUSINESS METHODS ************************* */
-double generic_get_link_latency(AS_t rc,
- const char *src, const char *dst,
- route_extended_t route)
-{
- int need_to_clean = route ? 0 : 1;
- void *link;
- unsigned int i;
- double latency = 0.0;
-
- route = route ? route : rc->get_route(rc, src, dst);
-
- xbt_dynar_foreach(route->generic_route.link_list, i, link) {
- latency += surf_network_model->extension.network.get_link_latency(link);
- }
- if (need_to_clean)
- generic_free_extended_route(route);
- return latency;
-}
-
-xbt_dynar_t generic_get_onelink_routes(AS_t rc)
-{
+xbt_dynar_t generic_get_onelink_routes(AS_t rc) { // FIXME: kill that stub
xbt_die("\"generic_get_onelink_routes\" not implemented yet");
+ return NULL;
}
-route_extended_t generic_get_bypassroute(AS_t rc,
- const char *src, const char *dst)
+route_t generic_get_bypassroute(AS_t rc, const char *src, const char *dst)
{
+ // If never set a bypass route return NULL
+ if(!having_set_bypassroute)
+ return NULL;
+
xbt_dict_t dict_bypassRoutes = rc->bypassRoutes;
AS_t src_as, dst_as;
int index_src, index_dst;
int max_index = max(max_index_src, max_index_dst);
int i, max;
- route_extended_t e_route_bypass = NULL;
+ route_t e_route_bypass = NULL;
for (max = 0; max <= max_index; max++) {
for (i = 0; i < max; i++) {
xbt_dynar_free(&path_src);
xbt_dynar_free(&path_dst);
- route_extended_t new_e_route = NULL;
+ route_t new_e_route = NULL;
if (e_route_bypass) {
void *link;
unsigned int cpt = 0;
- new_e_route = xbt_new0(s_route_extended_t, 1);
+ new_e_route = xbt_new0(s_route_t, 1);
new_e_route->src_gateway = xbt_strdup(e_route_bypass->src_gateway);
new_e_route->dst_gateway = xbt_strdup(e_route_bypass->dst_gateway);
- new_e_route->generic_route.link_list =
+ new_e_route->link_list =
xbt_dynar_new(global_routing->size_of_link, NULL);
- xbt_dynar_foreach(e_route_bypass->generic_route.link_list, cpt, link) {
- xbt_dynar_push(new_e_route->generic_route.link_list, &link);
+ xbt_dynar_foreach(e_route_bypass->link_list, cpt, link) {
+ xbt_dynar_push(new_e_route->link_list, &link);
}
}
return new_route;
}
-route_extended_t
+route_t
generic_new_extended_route(e_surf_routing_hierarchy_t hierarchy,
void *data, int order)
{
char *link_name;
- route_extended_t e_route, new_e_route;
+ route_t e_route, new_e_route;
route_t route;
unsigned int cpt;
xbt_dynar_t links = NULL, links_id = NULL;
- 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;
+ new_e_route = xbt_new0(s_route_t, 1);
+ new_e_route->link_list = xbt_dynar_new(global_routing->size_of_link, NULL);
xbt_assert(hierarchy == SURF_ROUTING_BASE
|| hierarchy == SURF_ROUTING_RECURSIVE,
} else if (hierarchy == SURF_ROUTING_RECURSIVE) {
- e_route = (route_extended_t) data;
+ e_route = (route_t) data;
xbt_assert(e_route->src_gateway
&& e_route->dst_gateway, "bad gateway, is null");
- links = e_route->generic_route.link_list;
+ links = e_route->link_list;
/* remeber not erase the gateway names */
new_e_route->src_gateway = strdup(e_route->src_gateway);
new_e_route->dst_gateway = strdup(e_route->dst_gateway);
}
- links_id = new_e_route->generic_route.link_list;
+ links_id = new_e_route->link_list;
xbt_dynar_foreach(links, cpt, link_name) {
void generic_free_route(route_t route)
{
if (route) {
- xbt_dynar_free(&(route->link_list));
+ xbt_dynar_free(&route->link_list);
+ xbt_free(route->src_gateway);
+ xbt_free(route->dst_gateway);
xbt_free(route);
}
}
-void generic_free_extended_route(route_extended_t e_route)
-{
- if (e_route) {
- xbt_dynar_free(&(e_route->generic_route.link_list));
- xbt_free(e_route->src_gateway);
- xbt_free(e_route->dst_gateway);
- xbt_free(e_route);
- }
-}
-
static AS_t generic_as_exist(AS_t find_from,
AS_t to_find)
{
