"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 (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 spurious 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);
}
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((route.src_gateway == NULL) ==
- (route.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 = route.src_gateway;
char*dst_gateway = route.dst_gateway;
xbt_dynar_push(*links, &link);
}
xbt_dynar_free(&route_dst);
-
}
+
+ 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;
}
void routing_exit(void) {
if (!global_routing)
return;
+ xbt_dynar_free(&global_routing->last_route);
finalize_rec(global_routing->root);
xbt_free(global_routing);
}