X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7e5ab0d2140f17598ab7f8ca86c2c38022bd954b..f0f95529ffdd1caec5aae2934470cc7d438bfafa:/src/surf/surf_routing.c diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c index 15cf032c06..2f2c37583d 100644 --- a/src/surf/surf_routing.c +++ b/src/surf/surf_routing.c @@ -127,7 +127,8 @@ static double base_vivaldi_get_latency (const char *src, const char *dst) xbt_assert(euclidean_dist>=0, "Euclidean Dist is less than 0\"%s\" and \"%.2f\"", src, euclidean_dist); - return euclidean_dist; + //From .ms to .s + return euclidean_dist / 1000; } static double vivaldi_get_link_latency (routing_component_t rc,const char *src, const char *dst, route_extended_t e_route) @@ -610,14 +611,14 @@ static void elements_father(const char *src, const char *dst, /* (2) find the path to the root routing component */ for (current = src_as ; current != NULL ; current = current->routing_father) { + if (index_src >= ELEMENTS_FATHER_MAXDEPTH) + xbt_die("ELEMENTS_FATHER_MAXDEPTH should be increased for path_src"); path_src[index_src++] = current; - xbt_assert(index_src <= ELEMENTS_FATHER_MAXDEPTH, - "ELEMENTS_FATHER_MAXDEPTH should be increased for path_src"); } for (current = dst_as ; current != NULL ; current = current->routing_father) { + if (index_dst >= ELEMENTS_FATHER_MAXDEPTH) + xbt_die("ELEMENTS_FATHER_MAXDEPTH should be increased for path_dst"); path_dst[index_dst++] = current; - xbt_assert(index_dst <= ELEMENTS_FATHER_MAXDEPTH, - "ELEMENTS_FATHER_MAXDEPTH should be increased for path_dst"); } /* (3) find the common father */ @@ -643,163 +644,152 @@ static void elements_father(const char *src, const char *dst, /* Global Business methods */ /** - * \brief Recursive function for get_route + * \brief Recursive function for get_route_latency * * \param src the source host name * \param dst the destination host name * \param *e_route the route where the links are stored + * \param *latency the latency, if needed * - * This function is called by "get_route". It allows to walk recursively - * through the routing components tree. + * This function is called by "get_route" and "get_latency". It allows to walk + * recursively through the routing components tree. */ -static void _get_route(const char *src, const char *dst,route_extended_t *e_route) +static void _get_route_latency(const char *src, const char *dst, + xbt_dynar_t *route, double *latency) { - XBT_DEBUG("Solve route \"%s\" to \"%s\"", src, dst); - xbt_assert(src && dst, "bad parameters for \"_get_route\" method"); + XBT_DEBUG("Solve route/latency \"%s\" to \"%s\"", src, dst); + xbt_assert(src && dst, "bad parameters for \"_get_route_latency\" method"); routing_component_t common_father; routing_component_t src_father; routing_component_t dst_father; elements_father(src, dst, &common_father, &src_father, &dst_father); - if (src_father == dst_father) { /* SURF_ROUTING_BASE */ + if (src_father == dst_father) { /* SURF_ROUTING_BASE */ - (*e_route) = - (*(common_father->get_route)) (common_father, src, dst); - xbt_assert((*e_route), "no route between \"%s\" and \"%s\"", src, - dst); + route_extended_t e_route = NULL; + if (route) { + e_route = common_father->get_route(common_father, src, dst); + xbt_assert(e_route, "no route between \"%s\" and \"%s\"", src, dst); + *route = e_route->generic_route.link_list; + } + if (latency) { + *latency = common_father->get_latency(common_father, src, dst, e_route); + xbt_assert(*latency >= 0.0, + "latency error on route between \"%s\" and \"%s\"", src, dst); + } + if (e_route) { + xbt_free(e_route->src_gateway); + xbt_free(e_route->dst_gateway); + xbt_free(e_route); + } } else { /* SURF_ROUTING_RECURSIVE */ - void *link; - unsigned int cpt = 0; - - route_extended_t e_route_cnt = NULL; - route_extended_t e_route_src = NULL; - route_extended_t e_route_dst = NULL; route_extended_t e_route_bypass = NULL; - - (*e_route) = xbt_new0(s_route_extended_t, 1); - (*e_route)->src_gateway = NULL; - (*e_route)->dst_gateway = NULL; - (*e_route)->generic_route.link_list = - xbt_dynar_new(global_routing->size_of_link, NULL); - if (common_father->get_bypass_route) - e_route_bypass = - (*(common_father->get_bypass_route)) (common_father, src, dst); + e_route_bypass = common_father->get_bypass_route(common_father, src, dst); - if (e_route_bypass) - e_route_cnt = e_route_bypass; - else - e_route_cnt = - (*(common_father->get_route)) (common_father, src_father->name, - dst_father->name); + xbt_assert(!latency || !e_route_bypass, + "Bypass cannot work yet with get_latency"); + + route_extended_t e_route_cnt = e_route_bypass + ? e_route_bypass + : common_father->get_route(common_father, + src_father->name, dst_father->name); xbt_assert(e_route_cnt, "no route between \"%s\" and \"%s\"", - src_father->name, dst_father->name); + src_father->name, dst_father->name); xbt_assert((e_route_cnt->src_gateway == NULL) == - (e_route_cnt->dst_gateway == NULL), - "bad gateway for route between \"%s\" and \"%s\"", src, - dst); + (e_route_cnt->dst_gateway == NULL), + "bad gateway for route between \"%s\" and \"%s\"", src, dst); + + if (route) { + *route = xbt_dynar_new(global_routing->size_of_link, NULL); + } + if (latency) { + *latency = common_father->get_latency(common_father, + src_father->name, dst_father->name, + e_route_cnt); + xbt_assert(*latency >= 0.0, + "latency error on route between \"%s\" and \"%s\"", + src_father->name, dst_father->name); + } + + void *link; + unsigned int cpt; if (strcmp(src, e_route_cnt->src_gateway)) { - _get_route(src, e_route_cnt->src_gateway, &e_route_src); - xbt_assert(e_route_src, "no route between \"%s\" and \"%s\"", src, - e_route_cnt->src_gateway); - xbt_dynar_foreach(e_route_src->generic_route.link_list, cpt, link) { - xbt_dynar_push((*e_route)->generic_route.link_list, &link); + double latency_src; + xbt_dynar_t route_src; + + _get_route_latency(src, e_route_cnt->src_gateway, + (route ? &route_src : NULL), + (latency ? &latency_src : NULL)); + if (route) { + xbt_assert(route_src, "no route between \"%s\" and \"%s\"", + src, e_route_cnt->src_gateway); + xbt_dynar_foreach(route_src, cpt, link) { + xbt_dynar_push(*route, &link); + } + xbt_dynar_free(&route_src); + } + if (latency) { + xbt_assert(latency_src >= 0.0, + "latency error on route between \"%s\" and \"%s\"", + src, e_route_cnt->src_gateway); + *latency += latency_src; } } - xbt_dynar_foreach(e_route_cnt->generic_route.link_list, cpt, link) { - xbt_dynar_push((*e_route)->generic_route.link_list, &link); + if (route) { + xbt_dynar_foreach(e_route_cnt->generic_route.link_list, cpt, link) { + xbt_dynar_push(*route, &link); + } } if (strcmp(e_route_cnt->dst_gateway, dst)) { - _get_route(e_route_cnt->dst_gateway, dst, &e_route_dst); - xbt_assert(e_route_dst, "no route between \"%s\" and \"%s\"", - e_route_cnt->dst_gateway, dst); - xbt_dynar_foreach(e_route_dst->generic_route.link_list, cpt, link) { - xbt_dynar_push((*e_route)->generic_route.link_list, &link); + double latency_dst; + xbt_dynar_t route_dst; + + _get_route_latency(e_route_cnt->dst_gateway, dst, + (route ? &route_dst : NULL), + (latency ? &latency_dst : NULL)); + if (route) { + xbt_assert(route_dst, "no route between \"%s\" and \"%s\"", + e_route_cnt->dst_gateway, dst); + xbt_dynar_foreach(route_dst, cpt, link) { + xbt_dynar_push(*route, &link); + } + xbt_dynar_free(&route_dst); + } + if (latency) { + xbt_assert(latency_dst >= 0.0, + "latency error on route between \"%s\" and \"%s\"", + e_route_cnt->dst_gateway, dst); + *latency += latency_dst; } } - (*e_route)->src_gateway = xbt_strdup(e_route_cnt->src_gateway); - (*e_route)->dst_gateway = xbt_strdup(e_route_cnt->dst_gateway); - - generic_free_extended_route(e_route_src); generic_free_extended_route(e_route_cnt); - generic_free_extended_route(e_route_dst); } } -static double _get_latency(const char *src, const char *dst) +/** + * \brief Generic function for get_route, get_route_no_cleanup, and get_latency + */ +static void get_route_latency(const char *src, const char *dst, + xbt_dynar_t *route, double *latency, int cleanup) { - double latency, latency_src, latency_dst = 0.0; - - XBT_DEBUG("Solve route \"%s\" to \"%s\"", src, dst); - xbt_assert(src && dst, "bad parameters for \"_get_route\" method"); - - route_extended_t e_route_cnt; - - routing_component_t common_father; - routing_component_t src_father; - routing_component_t dst_father; - elements_father(src, dst, &common_father, &src_father, &dst_father); - - if (src_father == dst_father) { /* SURF_ROUTING_BASE */ - - latency = - (*(common_father->get_latency)) (common_father, src, dst, NULL); - xbt_assert(latency>=0, "no route between \"%s\" and \"%s\"", src, - dst); - - } else { /* SURF_ROUTING_RECURSIVE */ - route_extended_t e_route_bypass = NULL; - if (common_father->get_bypass_route) - e_route_bypass = - (*(common_father->get_bypass_route)) (common_father, src, dst); - - xbt_assert(!e_route_bypass,"Bypass cannot work yet with get_latency"); - - e_route_cnt = - (*(common_father->get_route)) (common_father, src_father->name, - dst_father->name); - - xbt_assert(e_route_cnt, "no route between \"%s\" and \"%s\"", - src_father->name, dst_father->name); - - xbt_assert((e_route_cnt->src_gateway == NULL) == - (e_route_cnt->dst_gateway == NULL), - "bad gateway for route between \"%s\" and \"%s\"", src, - dst); - - latency = (*(common_father->get_latency)) (common_father, src_father->name, dst_father->name, e_route_cnt); - - xbt_assert(latency>=0, "no route between \"%s\" and \"%s\"", - src_father->name, dst_father->name); - - if (strcmp(src,e_route_cnt->src_gateway)) { - - latency_src = _get_latency(src, e_route_cnt->src_gateway); - xbt_assert(latency_src>=0, "no route between \"%s\" and \"%s\"", src, - e_route_cnt->src_gateway); - latency += latency_src; - } - - if (strcmp(e_route_cnt->dst_gateway,dst)) { - - latency_dst = _get_latency(e_route_cnt->dst_gateway, dst); - xbt_assert(latency_dst>=0, "no route between \"%s\" and \"%s\"", - e_route_cnt->dst_gateway, dst); - latency += latency_dst; - } - + _get_route_latency(src, dst, route, latency); + xbt_assert(!route || *route, "no route between \"%s\" and \"%s\"", src, dst); + xbt_assert(!latency || *latency >= 0.0, + "latency error on route between \"%s\" and \"%s\"", src, dst); + if (route) { + xbt_dynar_free(&global_routing->last_route); + global_routing->last_route = cleanup ? *route : NULL; } - - return latency; } /** @@ -814,24 +804,9 @@ static double _get_latency(const char *src, const char *dst) */ static xbt_dynar_t get_route(const char *src, const char *dst) { - - route_extended_t e_route = NULL; - - _get_route(src, dst, &e_route); - xbt_assert(e_route, "no route between \"%s\" and \"%s\"", src, dst); - - if (global_routing->last_route) - xbt_dynar_free(&(global_routing->last_route)); - global_routing->last_route = e_route->generic_route.link_list; - - if (e_route->src_gateway) - xbt_free(e_route->src_gateway); - if (e_route->dst_gateway) - xbt_free(e_route->dst_gateway); - - xbt_free(e_route); - - return global_routing->last_route; + xbt_dynar_t route = NULL; + get_route_latency(src, dst, &route, NULL, 1); + return route; } /** @@ -846,18 +821,16 @@ static xbt_dynar_t get_route(const char *src, const char *dst) */ static xbt_dynar_t get_route_no_cleanup(const char *src, const char *dst) { - xbt_dynar_t d = get_route(src,dst); - global_routing->last_route = NULL; - return d; + xbt_dynar_t route = NULL; + get_route_latency(src, dst, &route, NULL, 0); + return route; } /*Get Latency*/ static double get_latency(const char *src, const char *dst) { - double latency = -1.0; - latency = _get_latency(src, dst); - xbt_assert(latency>=0.0, "no route between \"%s\" and \"%s\"", src, dst); + get_route_latency(src, dst, NULL, &latency, 0); return latency; } @@ -965,6 +938,7 @@ void routing_model_create(size_t size_of_links, void *loopback, double_f_cpvoid_ global_routing->get_latency = get_latency; global_routing->get_route_no_cleanup = get_route_no_cleanup; global_routing->get_onelink_routes = get_onelink_routes; + global_routing->get_route_latency = get_route_latency; global_routing->get_network_element_type = get_network_element_type; global_routing->finalize = finalize; global_routing->loopback = loopback; @@ -1206,9 +1180,8 @@ route_extended_t generic_get_bypassroute(routing_component_t rc, current_src = xbt_dynar_get_ptr(path_src, index_src); current_dst = xbt_dynar_get_ptr(path_dst, index_dst); while (index_src >= 0 && index_dst >= 0 && *current_src == *current_dst) { - routing_component_t *tmp_src, *tmp_dst; - tmp_src = xbt_dynar_pop_ptr(path_src); - tmp_dst = xbt_dynar_pop_ptr(path_dst); + xbt_dynar_pop_ptr(path_src); + xbt_dynar_pop_ptr(path_dst); index_src--; index_dst--; current_src = xbt_dynar_get_ptr(path_src, index_src); @@ -1534,7 +1507,7 @@ void routing_parse_Scluster(void) char *cluster_availability_file = A_surfxml_cluster_availability_file; char *cluster_state_file = A_surfxml_cluster_state_file; char *host_id, *groups, *link_id = NULL; - char *router_id, *link_backbone; + char *router_id; char *availability_file = xbt_strdup(cluster_availability_file); char *state_file = xbt_strdup(cluster_state_file); @@ -1716,8 +1689,6 @@ void routing_parse_Scluster(void) router_id = bprintf("%s%s_router%s", cluster_prefix, cluster_id, cluster_suffix); - //link_router = bprintf("%s_link_%s_router", cluster_id, cluster_id); - link_backbone = bprintf("%s_backbone", cluster_id); XBT_DEBUG("", router_id); SURFXML_BUFFER_SET(router_id, router_id); @@ -1725,31 +1696,8 @@ void routing_parse_Scluster(void) SURFXML_START_TAG(router); SURFXML_END_TAG(router); - //TODO -// xbt_dict_set(patterns, "radical", xbt_strdup("_router"), xbt_free); -// temp_cluster_bw = xbt_strdup(cluster_bw); -// temp_cluster_bw = replace_random_parameter(temp_cluster_bw); -// temp_cluster_lat = xbt_strdup(cluster_lat); -// temp_cluster_lat = replace_random_parameter(temp_cluster_lat); -// XBT_DEBUG("", link_router,temp_cluster_bw, temp_cluster_lat); -// A_surfxml_link_state = A_surfxml_link_state_ON; -// 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, temp_cluster_bw); -// SURFXML_BUFFER_SET(link_latency, temp_cluster_lat); -// SURFXML_BUFFER_SET(link_bandwidth_file, ""); -// SURFXML_BUFFER_SET(link_latency_file, ""); -// SURFXML_BUFFER_SET(link_state_file, ""); -// SURFXML_START_TAG(link); -// SURFXML_END_TAG(link); - -// xbt_free(temp_cluster_bw); -// xbt_free(temp_cluster_lat); - + if(strcmp(cluster_bb_bw,"") && strcmp(cluster_bb_lat,"")){ + char *link_backbone = bprintf("%s_backbone", cluster_id); XBT_DEBUG("", link_backbone,cluster_bb_bw, cluster_bb_lat); A_surfxml_link_state = A_surfxml_link_state_ON; A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED; @@ -1763,6 +1711,8 @@ void routing_parse_Scluster(void) SURFXML_BUFFER_SET(link_state_file, ""); SURFXML_START_TAG(link); SURFXML_END_TAG(link); + free(link_backbone); + } XBT_DEBUG(" "); @@ -1793,11 +1743,13 @@ void routing_parse_Scluster(void) A_surfxml_route_symmetrical = A_surfxml_route_symmetrical_NO; SURFXML_START_TAG(route); + if(strcmp(cluster_bb_bw,"") && strcmp(cluster_bb_lat,"")){ XBT_DEBUG("", pcre_link_backbone); SURFXML_BUFFER_SET(link_ctn_id, pcre_link_backbone); A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE; SURFXML_START_TAG(link_ctn); SURFXML_END_TAG(link_ctn); + } XBT_DEBUG(""); SURFXML_END_TAG(route); @@ -1818,11 +1770,13 @@ void routing_parse_Scluster(void) SURFXML_START_TAG(link_ctn); SURFXML_END_TAG(link_ctn); + if(strcmp(cluster_bb_bw,"") && strcmp(cluster_bb_lat,"")){ XBT_DEBUG("", pcre_link_backbone); SURFXML_BUFFER_SET(link_ctn_id, pcre_link_backbone); A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE; SURFXML_START_TAG(link_ctn); SURFXML_END_TAG(link_ctn); + } XBT_DEBUG(""); SURFXML_END_TAG(route); @@ -1835,11 +1789,13 @@ void routing_parse_Scluster(void) A_surfxml_route_symmetrical = A_surfxml_route_symmetrical_NO; SURFXML_START_TAG(route); + if(strcmp(cluster_bb_bw,"") && strcmp(cluster_bb_lat,"")){ XBT_DEBUG("", pcre_link_backbone); SURFXML_BUFFER_SET(link_ctn_id, pcre_link_backbone); A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE; SURFXML_START_TAG(link_ctn); SURFXML_END_TAG(link_ctn); + } XBT_DEBUG("", pcre_link_dst); SURFXML_BUFFER_SET(link_ctn_id, pcre_link_dst); @@ -1868,11 +1824,13 @@ void routing_parse_Scluster(void) SURFXML_START_TAG(link_ctn); SURFXML_END_TAG(link_ctn); + if(strcmp(cluster_bb_bw,"") && strcmp(cluster_bb_lat,"")){ XBT_DEBUG("", pcre_link_backbone); SURFXML_BUFFER_SET(link_ctn_id, pcre_link_backbone); A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE; SURFXML_START_TAG(link_ctn); SURFXML_END_TAG(link_ctn); + } XBT_DEBUG("", pcre_link_dst); SURFXML_BUFFER_SET(link_ctn_id, pcre_link_dst); @@ -1889,6 +1847,7 @@ void routing_parse_Scluster(void) free(pcre_link_backbone); free(pcre_link_src); free(route_src_dst); + #else for (i = 0; i <= xbt_dynar_length(tab_elements_num); i++) { for (j = 0; j <= xbt_dynar_length(tab_elements_num); j++) { @@ -1931,11 +1890,13 @@ void routing_parse_Scluster(void) free(route_src); } + if(strcmp(cluster_bb_bw,"") && strcmp(cluster_bb_lat,"")){ XBT_DEBUG("", 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); + } if (j != xbt_dynar_length(tab_elements_num)) { route_dst = @@ -1960,8 +1921,6 @@ void routing_parse_Scluster(void) #endif free(router_id); - free(link_backbone); - //free(link_router); xbt_dict_free(&patterns); free(availability_file); free(state_file);