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);
- xbt_dict_set(_parse_routes, route_name, route, NULL);
+ 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 exists", src,dst);
+ else
+ xbt_dict_set(_parse_routes, route_name, route, NULL);
+
xbt_free(route_name);
- if(A_surfxml_route_symetrical == A_surfxml_route_symetrical_YES)
- {
- int i;
- route_t route_sym = xbt_new0(s_route_t, 1);
- route_sym->link_list = xbt_dynar_new(sizeof(char *),NULL);
- 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 *));
- xbt_dynar_push_as(route_sym->link_list ,char *, link_name);
- }
- DEBUG2("Load Route from \"%s\" to \"%s\"", dst, src);
- xbt_dict_set(_parse_routes, bprintf("%d#%d",*dst_id, *src_id), route_sym, NULL);
- }
+ if (A_surfxml_route_symetrical == A_surfxml_route_symetrical_YES) {
+ int i;
+ route_t route_sym = xbt_new0(s_route_t, 1);
+ route_sym->link_list = xbt_dynar_new(sizeof(char *),NULL);
+ for(i=nb_links ; i>0 ; i--) {
+ 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 exists", dst,src);
+ else
+ xbt_dict_set(_parse_routes, bprintf("%d#%d",*dst_id, *src_id), route_sym, NULL);
+ }
}
static void generic_set_ASroute(routing_component_t rc, const char *src,
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);
- xbt_dict_set(_parse_routes, route_name, e_route, NULL);
+ 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 exists",
+ src, e_route->src_gateway, dst, e_route->dst_gateway);
+ else
+ xbt_dict_set(_parse_routes, route_name, e_route, NULL);
+
xbt_free(route_name);
unsigned long nb_links = xbt_dynar_length(e_route->generic_route.link_list);
- if(A_surfxml_ASroute_symetrical == A_surfxml_ASroute_symetrical_YES)
- {
- int i;
- route_extended_t route_sym = xbt_new0(s_route_extended_t, 1);
- route_sym->generic_route.link_list = xbt_dynar_new(sizeof(char *),NULL);
- for(i=nb_links ; i>0 ; i--)
- {
- char *link_name = xbt_new0(char,strlen(xbt_dynar_get_as(e_route->generic_route.link_list, i-1, char *)));
- link_name = bprintf("%s",xbt_dynar_get_as(e_route->generic_route.link_list, i-1, char *));
- xbt_dynar_push_as(route_sym->generic_route.link_list ,char *, link_name);
- }
- route_sym->src_gateway = xbt_new0( char,strlen(e_route->dst_gateway) );
- route_sym->src_gateway = bprintf("%s",e_route->dst_gateway);
- 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);
- xbt_dict_set(_parse_routes, bprintf("%d#%d", *dst_id, *src_id), route_sym, NULL);
- }
+ if (A_surfxml_ASroute_symetrical == A_surfxml_ASroute_symetrical_YES) {
+ int i;
+ route_extended_t route_sym = xbt_new0(s_route_extended_t, 1);
+ route_sym->generic_route.link_list = xbt_dynar_new(sizeof(char *),NULL);
+ for(i=nb_links ; i>0 ; i--) {
+ char *link_name = bprintf("%s",xbt_dynar_get_as(e_route->generic_route.link_list, i-1, char *));
+ xbt_dynar_push_as(route_sym->generic_route.link_list ,char *, link_name);
+ }
+ route_sym->src_gateway = xbt_new0( char,strlen(e_route->dst_gateway) );
+ route_sym->src_gateway = bprintf("%s",e_route->dst_gateway);
+ 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 exists",
+ dst, route_sym->src_gateway, src, route_sym->dst_gateway);
+ else
+ xbt_dict_set(_parse_routes, bprintf("%d#%d", *dst_id, *src_id), route_sym, NULL);
+ }
}
static void generic_set_bypassroute(routing_component_t rc,
xbt_dynar_t radical_elements;
xbt_dynar_t radical_ends;
int cluster_sharing_policy = AX_surfxml_cluster_sharing_policy;
-
- if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX)
- {DEBUG0("cluster with sharing_policy FULLDUPLEX");}
- if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_SHARED)
- {DEBUG0("cluster with sharing_policy SHARED");}
+ int cluster_bb_sharing_policy = AX_surfxml_cluster_bb_sharing_policy;
#ifndef HAVE_PCRE_LIB
xbt_dynar_t tab_elements_num = xbt_dynar_new(sizeof(int), NULL);
A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED;
if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX)
{A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_FULLDUPLEX;}
+ if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FATPIPE)
+ {A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_FATPIPE;}
SURFXML_BUFFER_SET(link_id, link_id);
SURFXML_BUFFER_SET(link_bandwidth, cluster_bw);
SURFXML_BUFFER_SET(link_latency, cluster_lat);
A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED;
if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX)
{A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_FULLDUPLEX;}
+ if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FATPIPE)
+ {A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_FATPIPE;}
SURFXML_BUFFER_SET(link_id, link_id);
SURFXML_BUFFER_SET(link_bandwidth, cluster_bw);
SURFXML_BUFFER_SET(link_latency, cluster_lat);
A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED;
if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX)
{A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_FULLDUPLEX;}
+ if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FATPIPE)
+ {A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_FATPIPE;}
SURFXML_BUFFER_SET(link_id, link_router);
SURFXML_BUFFER_SET(link_bandwidth, cluster_bw);
SURFXML_BUFFER_SET(link_latency, cluster_lat);
DEBUG3("<link\tid=\"%s\" bw=\"%s\" lat=\"%s\"/>", link_backbone,cluster_bw, cluster_lat);
A_surfxml_link_state = A_surfxml_link_state_ON;
A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED;
+ if(cluster_bb_sharing_policy == A_surfxml_cluster_bb_sharing_policy_FATPIPE)
+ {A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_FATPIPE;}
SURFXML_BUFFER_SET(link_id, link_backbone);
SURFXML_BUFFER_SET(link_bandwidth, cluster_bb_bw);
SURFXML_BUFFER_SET(link_latency, cluster_bb_lat);
SURFXML_BUFFER_SET(link_ctn_id, bprintf("%s_link_$1dst", cluster_id));
A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE;
if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX)
- {A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_UP;}
+ {A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_DOWN;}
SURFXML_START_TAG(link_ctn);
SURFXML_END_TAG(link_ctn);
DEBUG1("<link_ctn\tid=\"%s\"/>", route_src);
SURFXML_BUFFER_SET(link_ctn_id, route_src);
+ A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE;
if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX)
{A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_UP;}
SURFXML_START_TAG(link_ctn);
DEBUG1("<link_ctn\tid=\"%s_backbone\"/>", cluster_id);
SURFXML_BUFFER_SET(link_ctn_id, bprintf("%s_backbone", cluster_id));
+ A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE;
SURFXML_START_TAG(link_ctn);
SURFXML_END_TAG(link_ctn);
DEBUG1("<link_ctn\tid=\"%s\"/>", route_dst);
SURFXML_BUFFER_SET(link_ctn_id, route_dst);
+ A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE;
if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX)
- {A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_UP;}
+ {A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_DOWN;}
SURFXML_START_TAG(link_ctn);
SURFXML_END_TAG(link_ctn);
