static void generic_set_bypassroute(routing_component_t rc,
const char *src, const char *dst,
route_extended_t e_route);
+int compare_routes(route_t route1, route_t route2);
/* ************************************************************************** */
/* *************** GENERIC BUSINESS METHODS (declarations) ****************** */
xbt_assert2(xbt_dynar_length(route->link_list) > 0,
"Invalid count of links, must be greater than zero (%s,%s)",
src, dst);
- xbt_assert2(!xbt_dict_get_or_null(_parse_routes, route_name),
- "The route between \"%s\" and \"%s\" already exist", src,
- dst);
+
+ route_t route_to_test = xbt_dict_get_or_null(_parse_routes, route_name);
+ if(route_to_test)
+ xbt_assert2(!xbt_dynar_compare(
+ (void*)route->link_list,
+ (void*)route_to_test->link_list,
+ (int_f_cpvoid_cpvoid_t) strcmp),
+ "The route between \"%s\" and \"%s\" already exist", src,dst);
xbt_dict_set(_parse_routes, route_name, route, NULL);
xbt_free(route_name);
for(i=nb_links ; i>0 ; i--)
{
char *link_name = xbt_new0(char,strlen(xbt_dynar_get_as(route->link_list, i-1, char *)));
- link_name = bprintf("%s",xbt_dynar_get_as(route->link_list, i-1, char *));
+ link_name = xbt_strdup(xbt_dynar_get_as(route->link_list, i-1, char *));
xbt_dynar_push_as(route_sym->link_list ,char *, link_name);
}
DEBUG2("Load Route from \"%s\" to \"%s\"", dst, src);
+ route_to_test = xbt_dict_get_or_null(_parse_routes, bprintf("%d#%d",*dst_id, *src_id));
+ if(route_to_test)
+ xbt_assert2(!xbt_dynar_compare(
+ (void*)route_sym->link_list,
+ (void*)route_to_test->link_list,
+ (int_f_cpvoid_cpvoid_t) strcmp),
+ "The route between \"%s\" and \"%s\" already exist", dst,src);
xbt_dict_set(_parse_routes, bprintf("%d#%d",*dst_id, *src_id), route_sym, NULL);
}
}
xbt_assert2(xbt_dynar_length(e_route->generic_route.link_list) > 0,
"Invalid count of links, must be greater than zero (%s,%s)",
src, dst);
- xbt_assert4(!xbt_dict_get_or_null(_parse_routes, route_name),
- "The route between \"%s\"(\"%s\") and \"%s\"(\"%s\") already exist",
- src, e_route->src_gateway, dst, e_route->dst_gateway);
+
+ route_t route_to_test = xbt_dict_get_or_null(_parse_routes, route_name);
+ if(route_to_test)
+ xbt_assert4(!xbt_dynar_compare(
+ (void*) (&e_route->generic_route)->link_list,
+ (void*) route_to_test->link_list,
+ (int_f_cpvoid_cpvoid_t) strcmp),
+ "The route between \"%s\"(\"%s\") and \"%s\"(\"%s\") already exist",
+ src, e_route->src_gateway, dst, e_route->dst_gateway);
xbt_dict_set(_parse_routes, route_name, e_route, NULL);
xbt_free(route_name);
route_sym->dst_gateway = xbt_new0( char,strlen(e_route->src_gateway) );
route_sym->dst_gateway = bprintf("%s",e_route->src_gateway);
DEBUG4("Load ASroute from \"%s(%s)\" to \"%s(%s)\"",dst, route_sym->src_gateway,src,route_sym->dst_gateway);
+
+ route_to_test = xbt_dict_get_or_null(_parse_routes, bprintf("%d#%d", *dst_id, *src_id));
+ if(route_to_test)
+ xbt_assert4(!xbt_dynar_compare(
+ (void*) (&route_sym->generic_route)->link_list,
+ (void*) route_to_test->link_list,
+ (int_f_cpvoid_cpvoid_t) strcmp),
+ "The route between \"%s\"(\"%s\") and \"%s\"(\"%s\") already exist",
+ dst, route_sym->src_gateway, src, route_sym->dst_gateway);
+
xbt_dict_set(_parse_routes, bprintf("%d#%d", *dst_id, *src_id), route_sym, NULL);
}
}