X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ece2a48768fd651b376314538a44fe06da2abec0..f365d61a634d854a3244979c0524de3cf3a74f72:/src/surf/surf_routing.c diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c index a9630d2eb0..1d11084198 100644 --- a/src/surf/surf_routing.c +++ b/src/surf/surf_routing.c @@ -39,7 +39,7 @@ routing_global_t global_routing = NULL; AS_t current_routing = NULL; /* global parse functions */ -xbt_dynar_t link_list = NULL; /* temporary store of current list link of a route */ +xbt_dynar_t parsed_link_list = NULL; /* temporary store of current list link of a route */ static const char *src = NULL; /* temporary store the source name of a route */ static const char *dst = NULL; /* temporary store the destination name of a route */ static char *gw_src = NULL; /* temporary store the gateway source name of a route */ @@ -168,7 +168,7 @@ static void parse_S_router(sg_platf_router_cbarg_t router) */ static void routing_parse_S_route(void) { - if (src != NULL && dst != NULL && link_list != NULL) + if (src != NULL && dst != NULL && parsed_link_list != NULL) THROWF(arg_error, 0, "Route between %s to %s can not be defined", A_surfxml_route_src, A_surfxml_route_dst); src = A_surfxml_route_src; @@ -176,7 +176,7 @@ static void routing_parse_S_route(void) xbt_assert(strlen(src) > 0 || strlen(dst) > 0, "Some limits are null in the route between \"%s\" and \"%s\"", src, dst); - link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref); + parsed_link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref); } /** @@ -184,7 +184,7 @@ static void routing_parse_S_route(void) */ static void routing_parse_S_ASroute(void) { - if (src != NULL && dst != NULL && link_list != NULL) + if (src != NULL && dst != NULL && parsed_link_list != NULL) THROWF(arg_error, 0, "Route between %s to %s can not be defined", A_surfxml_ASroute_src, A_surfxml_ASroute_dst); src = A_surfxml_ASroute_src; @@ -195,7 +195,7 @@ static void routing_parse_S_ASroute(void) || strlen(gw_dst) > 0, "Some limits are null in the route between \"%s\" and \"%s\"", src, dst); - link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref); + parsed_link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref); } /** @@ -203,7 +203,7 @@ static void routing_parse_S_ASroute(void) */ static void routing_parse_S_bypassRoute(void) { - if (src != NULL && dst != NULL && link_list != NULL) + if (src != NULL && dst != NULL && parsed_link_list != NULL) THROWF(arg_error, 0, "Bypass Route between %s to %s can not be defined", A_surfxml_bypassRoute_src, A_surfxml_bypassRoute_dst); @@ -215,7 +215,7 @@ static void routing_parse_S_bypassRoute(void) || strlen(gw_dst) > 0, "Some limits are null in the route between \"%s\" and \"%s\"", src, dst); - link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref); + parsed_link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref); } /** @@ -237,7 +237,7 @@ static void routing_parse_link_ctn(void) link_id = bprintf("%s_DOWN", A_surfxml_link_ctn_id); break; } - xbt_dynar_push(link_list, &link_id); + xbt_dynar_push(parsed_link_list, &link_id); } /** @@ -246,12 +246,13 @@ static void routing_parse_link_ctn(void) static void routing_parse_E_route(void) { route_t route = xbt_new0(s_route_t, 1); - route->link_list = link_list; + route->link_list = parsed_link_list; xbt_assert(current_routing->parse_route, "no defined method \"set_route\" in \"%s\"", current_routing->name); current_routing->parse_route(current_routing, src, dst, route); - link_list = NULL; + generic_free_route(route); + parsed_link_list = NULL; src = NULL; dst = NULL; } @@ -262,14 +263,15 @@ static void routing_parse_E_route(void) static void routing_parse_E_ASroute(void) { route_t e_route = xbt_new0(s_route_t, 1); - e_route->link_list = link_list; + e_route->link_list = parsed_link_list; e_route->src_gateway = xbt_strdup(gw_src); e_route->dst_gateway = xbt_strdup(gw_dst); xbt_assert(current_routing->parse_ASroute, "no defined method \"set_ASroute\" in \"%s\"", current_routing->name); current_routing->parse_ASroute(current_routing, src, dst, e_route); - link_list = NULL; + generic_free_route(e_route); + parsed_link_list = NULL; src = NULL; dst = NULL; gw_src = NULL; @@ -282,14 +284,14 @@ static void routing_parse_E_ASroute(void) static void routing_parse_E_bypassRoute(void) { route_t e_route = xbt_new0(s_route_t, 1); - e_route->link_list = link_list; + e_route->link_list = parsed_link_list; e_route->src_gateway = xbt_strdup(gw_src); e_route->dst_gateway = xbt_strdup(gw_dst); xbt_assert(current_routing->parse_bypassroute, "Bypassing mechanism not implemented by routing '%s'", current_routing->name); current_routing->parse_bypassroute(current_routing, src, dst, e_route); - link_list = NULL; + parsed_link_list = NULL; src = NULL; dst = NULL; gw_src = NULL; @@ -485,10 +487,12 @@ static void elements_father(const char *src, const char *dst, * recursively through the ASes tree. */ static void _get_route_and_latency(const char *src, const char *dst, - xbt_dynar_t * route, double *latency) + xbt_dynar_t * links, double *latency) { void *link; unsigned int cpt; + s_route_t route; + memset(&route,0,sizeof(route)); XBT_DEBUG("Solve route/latency \"%s\" to \"%s\"", src, dst); xbt_assert(src && dst, "bad parameters for \"_get_route_latency\" method"); @@ -500,18 +504,12 @@ static void _get_route_and_latency(const char *src, const char *dst, /* If src and dst are in the same AS, life is good */ if (src_father == dst_father) { /* SURF_ROUTING_BASE */ - route_t e_route = xbt_new0(s_route_t, 1); - e_route->link_list = xbt_dynar_new(global_routing->size_of_link, NULL); - - common_father->get_route(common_father, src, dst, e_route); - *route = e_route->link_list; + route.link_list = *links; - if (latency) - *latency += common_father->get_latency(common_father, src, dst, e_route); + common_father->get_route_and_latency(common_father, src, dst, &route,latency); - xbt_free(e_route->src_gateway); - xbt_free(e_route->dst_gateway); - xbt_free(e_route); + xbt_free(route.src_gateway); + xbt_free(route.dst_gateway); return; } @@ -523,12 +521,12 @@ static void _get_route_and_latency(const char *src, const char *dst, if (e_route_bypass) { /* Common ancestor is kind enough to declare a bypass route from src to dst -- use it and bail out */ if (latency) - xbt_die("Bypass cannot work yet with get_latency"); // FIXME: that limitation seems supurious to me -- check with alvin - - *route = xbt_dynar_new(global_routing->size_of_link, NULL); + xbt_die("Bypass cannot work yet with get_latency"); // FIXME: get_bypass_route should update the latency itself, just like get_route +// // FIXME this path is never tested. I need examples to check the bypass mechanism... +// THROW_UNIMPLEMENTED; // let's warn the users of the problem xbt_dynar_foreach(e_route_bypass->link_list, cpt, link) { - xbt_dynar_push(*route, &link); + xbt_dynar_push(*links, &link); } generic_free_route(e_route_bypass); @@ -538,60 +536,39 @@ static void _get_route_and_latency(const char *src, const char *dst, /* Not in the same AS, no bypass. We'll have to find our path between the ASes recursively*/ - route_t e_route_cnt = xbt_new0(s_route_t, 1); - e_route_cnt->link_list = xbt_dynar_new(global_routing->size_of_link, NULL); - common_father->get_route(common_father, src_father->name, dst_father->name, e_route_cnt); + route.link_list = xbt_dynar_new(global_routing->size_of_link, NULL); + common_father->get_route_and_latency(common_father, src_father->name, dst_father->name, &route,latency); - 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); - - *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((route.src_gateway != NULL) && (route.dst_gateway != NULL), + "bad gateways for route from \"%s\" to \"%s\"", src, dst); + char*src_gateway = route.src_gateway; + char*dst_gateway = route.dst_gateway; /* If source gateway is not our source, we have to recursively find our way up to this point */ - if (strcmp(src, e_route_cnt->src_gateway)) { - xbt_dynar_t route_src; + if (strcmp(src, src_gateway)) + _get_route_and_latency(src, src_gateway, links, latency); - _get_route_and_latency(src, e_route_cnt->src_gateway, - (route ? &route_src : NULL), - latency); - - xbt_dynar_foreach(route_src, cpt, link) { - xbt_dynar_push(*route, &link); - } - xbt_dynar_free(&route_src); - } - - xbt_dynar_foreach(e_route_cnt->link_list, cpt, link) { - xbt_dynar_push(*route, &link); + xbt_dynar_foreach(route.link_list, cpt, link) { + xbt_dynar_push(*links, &link); } /* If dest gateway is not our destination, we have to recursively find our way from this point */ - if (strcmp(e_route_cnt->dst_gateway, dst)) { - xbt_dynar_t route_dst; + // FIXME why can't I factorize it the same way than [src;src_gw] without breaking the examples?? + if (strcmp(dst_gateway, dst)) { + xbt_dynar_t route_dst = xbt_dynar_new(global_routing->size_of_link,NULL); - _get_route_and_latency(e_route_cnt->dst_gateway, dst, - (route ? &route_dst : NULL), - latency); + _get_route_and_latency(dst_gateway, dst, &route_dst, latency); xbt_dynar_foreach(route_dst, cpt, link) { - xbt_dynar_push(*route, &link); + xbt_dynar_push(*links, &link); } xbt_dynar_free(&route_dst); - } - generic_free_route(e_route_cnt); + xbt_free(src_gateway); + xbt_free_f(dst_gateway); + xbt_dynar_free(&route.link_list); } /** @@ -611,13 +588,9 @@ static void _get_route_and_latency(const char *src, const char *dst, void routing_get_route_and_latency(const char *src, const char *dst, xbt_dynar_t * route, double *latency) { - static xbt_dynar_t last_route = NULL; - - int need_cleanup = !(*route); - - if (need_cleanup) { - xbt_dynar_free(&last_route); - last_route = *route = xbt_dynar_new(global_routing->size_of_link,NULL); + if (!*route) { + xbt_dynar_reset(global_routing->last_route); + *route = global_routing->last_route; } _get_route_and_latency(src, dst, route, latency); @@ -687,6 +660,7 @@ void routing_model_create(size_t size_of_links, void *loopback) global_routing->get_onelink_routes = get_onelink_routes; global_routing->loopback = loopback; global_routing->size_of_link = size_of_links; + global_routing->last_route = xbt_dynar_new(global_routing->size_of_link,NULL); /* no current routing at moment */ current_routing = NULL; } @@ -754,10 +728,10 @@ static void routing_parse_cluster(sg_platf_cluster_cbarg_t cluster) if (strcmp(cluster->availability_trace, "") || strcmp(cluster->state_trace, "")) { - patterns = xbt_dict_new(); - xbt_dict_set(patterns, "id", xbt_strdup(cluster->id), free); - xbt_dict_set(patterns, "prefix", xbt_strdup(cluster->prefix), free); - xbt_dict_set(patterns, "suffix", xbt_strdup(cluster->suffix), free); + patterns = xbt_dict_new_homogeneous(xbt_free_f); + xbt_dict_set(patterns, "id", xbt_strdup(cluster->id), NULL); + xbt_dict_set(patterns, "prefix", xbt_strdup(cluster->prefix), NULL); + xbt_dict_set(patterns, "suffix", xbt_strdup(cluster->suffix), NULL); } @@ -792,7 +766,7 @@ static void routing_parse_cluster(sg_platf_cluster_cbarg_t cluster) memset(&host, 0, sizeof(host)); host.id = host_id; if (strcmp(cluster->availability_trace, "")) { - xbt_dict_set(patterns, "radical", bprintf("%d", i), xbt_free); + xbt_dict_set(patterns, "radical", bprintf("%d", i), NULL); char *avail_file = xbt_str_varsubst(cluster->availability_trace, patterns); XBT_DEBUG("\tavailability_file=\"%s\"", avail_file); host.power_trace = tmgr_trace_new(avail_file); @@ -1065,12 +1039,12 @@ static void routing_parse_Srandom(void) random->generator, random->seed, random_radical); if (!random_value) - random_value = xbt_dict_new(); + random_value = xbt_dict_new_homogeneous(free); if (!strcmp(random_radical, "")) { res = random_generate(random); rd_value = bprintf("%f", res); - xbt_dict_set(random_value, random_id, rd_value, free); + xbt_dict_set(random_value, random_id, rd_value, NULL); } else { radical_elements = xbt_str_split(random_radical, ","); xbt_dynar_foreach(radical_elements, iter, groups) { @@ -1083,7 +1057,7 @@ static void routing_parse_Srandom(void) tmpbuf = bprintf("%s%d", random_id, atoi(xbt_dynar_getfirst_as(radical_ends, char *))); - xbt_dict_set(random_value, tmpbuf, bprintf("%f", res), free); + xbt_dict_set(random_value, tmpbuf, bprintf("%f", res), NULL); xbt_free(tmpbuf); break; @@ -1097,7 +1071,7 @@ static void routing_parse_Srandom(void) i)); res = random_generate(random); tmpbuf = bprintf("%s%d", random_id, i); - xbt_dict_set(random_value, tmpbuf, bprintf("%f", res), free); + xbt_dict_set(random_value, tmpbuf, bprintf("%f", res), NULL); xbt_free(tmpbuf); } break; @@ -1108,7 +1082,7 @@ static void routing_parse_Srandom(void) res = random_generate(random); rd_name = bprintf("%s_router", random_id); rd_value = bprintf("%f", res); - xbt_dict_set(random_value, rd_name, rd_value, free); + xbt_dict_set(random_value, rd_name, rd_value, NULL); xbt_dynar_free(&radical_ends); } @@ -1170,6 +1144,7 @@ static void finalize_rec(AS_t as) { void routing_exit(void) { if (!global_routing) return; + xbt_dynar_free(&global_routing->last_route); finalize_rec(global_routing->root); xbt_free(global_routing); }