"no defined method \"set_route\" in \"%s\"",
current_routing->name);
current_routing->parse_route(current_routing, src, dst, route);
+ generic_free_route(route);
parsed_link_list = NULL;
src = NULL;
dst = NULL;
"no defined method \"set_ASroute\" in \"%s\"",
current_routing->name);
current_routing->parse_ASroute(current_routing, src, dst, e_route);
+ generic_free_route(e_route);
parsed_link_list = NULL;
src = NULL;
dst = NULL;
/* If src and dst are in the same AS, life is good */
if (src_father == dst_father) { /* SURF_ROUTING_BASE */
- route.link_list = xbt_dynar_new(global_routing->size_of_link, NULL);
+ route.link_list = *links;
common_father->get_route_and_latency(common_father, src, dst, &route,latency);
- *links = route.link_list;
xbt_free(route.src_gateway);
xbt_free(route.dst_gateway);
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
-
- *links = 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(*links, &link);
}
/* 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_and_latency(common_father, src_father->name, dst_father->name, e_route_cnt,latency);
-
- xbt_assert(e_route_cnt, "no route between \"%s\" and \"%s\"",
- src_father->name, dst_father->name);
+ 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->src_gateway == NULL) ==
- (e_route_cnt->dst_gateway == NULL),
+ xbt_assert((route.src_gateway != NULL) && (route.dst_gateway != NULL),
"bad gateways for route from \"%s\" to \"%s\"", src, dst);
- *links = xbt_dynar_new(global_routing->size_of_link, NULL);
-
- char*src_gateway = e_route_cnt->src_gateway;
- char*dst_gateway = e_route_cnt->dst_gateway;
+ 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, src_gateway))
- _get_route_and_latency(src, src_gateway, links,latency);
+ _get_route_and_latency(src, src_gateway, links, latency);
- xbt_dynar_foreach(e_route_cnt->link_list, cpt, 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 */
// 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_t route_dst = xbt_dynar_new(global_routing->size_of_link,NULL);
- _get_route_and_latency(dst_gateway, dst,
- &route_dst, latency);
+ _get_route_and_latency(dst_gateway, dst, &route_dst, latency);
xbt_dynar_foreach(route_dst, cpt, 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);
}
/**
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);
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;
}
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);
}
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);
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) {
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;
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;
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);
}
void routing_exit(void) {
if (!global_routing)
return;
+ xbt_dynar_free(&global_routing->last_route);
finalize_rec(global_routing->root);
xbt_free(global_routing);
}
