X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a09eb6556675019e53ca2566d0f9770fbe77ef82..8a63264af07173eaba26c404f4e647cc9a9c584e:/src/surf/surf_routing.c diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c index c7697f5e5a..69949a6352 100644 --- a/src/surf/surf_routing.c +++ b/src/surf/surf_routing.c @@ -54,9 +54,10 @@ static void model_none_load(void); /* none routing model */ static void model_none_unload(void); /* none routing model */ static void model_none_end(void); /* none routing model */ -static void routing_full_parse_Scluster(void); /*cluster bypass */ +static void routing_parse_Scluster(void); /*cluster bypass */ -static void parse_Sconfig(void); /*config Tag */ +static void routing_parse_Sconfig(void); /*config Tag */ +static void routing_parse_Econfig(void); /*config Tag */ /* this lines are only for replace use like index in the model table */ typedef enum { @@ -113,6 +114,7 @@ static void generic_set_ASroute(routing_component_t rc, const char *src, 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) ****************** */ @@ -146,7 +148,6 @@ static char *dst = NULL; /* temporary store the destination name of a rou static char *gw_src = NULL; /* temporary store the gateway source name of a route */ static char *gw_dst = NULL; /* temporary store the gateway destination name of a route */ static xbt_dynar_t link_list = NULL; /* temporary store of current list link of a route */ - /** * \brief Add a "host" to the network element list */ @@ -896,9 +897,12 @@ void routing_model_create(size_t size_of_links, void *loopback) surfxml_add_callback(ETag_surfxml_AS_cb_list, &parse_E_AS_XML); surfxml_add_callback(STag_surfxml_cluster_cb_list, - &routing_full_parse_Scluster); + &routing_parse_Scluster); - surfxml_add_callback(STag_surfxml_config_cb_list, &parse_Sconfig); + surfxml_add_callback(STag_surfxml_config_cb_list, + &routing_parse_Sconfig); + surfxml_add_callback(ETag_surfxml_config_cb_list, + &routing_parse_Econfig); } /* ************************************************************************** */ @@ -2502,9 +2506,14 @@ static void generic_set_route(routing_component_t rc, const char *src, 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); @@ -2517,10 +2526,17 @@ static void generic_set_route(routing_component_t rc, const char *src, 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); } } @@ -2549,9 +2565,15 @@ 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); + + 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); @@ -2573,6 +2595,16 @@ static void generic_set_ASroute(routing_component_t rc, const char *src, 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); } } @@ -2907,13 +2939,25 @@ static void generic_src_dst_check(routing_component_t rc, const char *src, rc->name, dst_as->name); } -static void parse_Sconfig(void) +static void routing_parse_Sconfig(void) { //TODO DEBUG0("WARNING tag config not yet implemented."); + DEBUG1("Configuration name = %s",A_surfxml_config_id); } -static void routing_full_parse_Scluster(void) +static void routing_parse_Econfig(void) +{ + //TODO + xbt_dict_cursor_t cursor = NULL; + char *key; + char *elem; + xbt_dict_foreach(current_property_set, cursor, key, elem) { + DEBUG2("property : %s = %s",key,elem); + } +} + +static void routing_parse_Scluster(void) { static int AX_ptr = 0; @@ -2933,11 +2977,7 @@ static void routing_full_parse_Scluster(void) 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); @@ -2990,6 +3030,8 @@ static void routing_full_parse_Scluster(void) 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); @@ -3029,6 +3071,8 @@ static void routing_full_parse_Scluster(void) 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); @@ -3064,6 +3108,8 @@ static void routing_full_parse_Scluster(void) 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); @@ -3076,6 +3122,8 @@ static void routing_full_parse_Scluster(void) DEBUG3("", 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); @@ -3124,7 +3172,7 @@ static void routing_full_parse_Scluster(void) 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); @@ -3176,6 +3224,7 @@ static void routing_full_parse_Scluster(void) DEBUG1("", 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); @@ -3183,13 +3232,15 @@ static void routing_full_parse_Scluster(void) DEBUG1("", 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("", 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);