A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Include surf_resource.h, for surf_resource_name().
[simgrid.git]
/
src
/
surf
/
surf_routing.c
diff --git
a/src/surf/surf_routing.c
b/src/surf/surf_routing.c
index
a507e10
..
38e071a
100644
(file)
--- a/
src/surf/surf_routing.c
+++ b/
src/surf/surf_routing.c
@@
-251,6
+251,7
@@
static void routing_parse_E_route(void)
"no defined method \"set_route\" in \"%s\"",
current_routing->name);
current_routing->parse_route(current_routing, src, dst, route);
"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;
parsed_link_list = NULL;
src = NULL;
dst = NULL;
@@
-269,6
+270,7
@@
static void routing_parse_E_ASroute(void)
"no defined method \"set_ASroute\" in \"%s\"",
current_routing->name);
current_routing->parse_ASroute(current_routing, src, dst, e_route);
"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;
parsed_link_list = NULL;
src = NULL;
dst = NULL;
@@
-521,8
+523,8
@@
static void _get_route_and_latency(const char *src, const char *dst,
if (latency)
xbt_die("Bypass cannot work yet with get_latency"); // FIXME: get_bypass_route should update the latency itself, just like get_route
if (latency)
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
+
//
// 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);
}
xbt_dynar_foreach(e_route_bypass->link_list, cpt, link) {
xbt_dynar_push(*links, &link);
}
@@
-540,8
+542,6
@@
static void _get_route_and_latency(const char *src, const char *dst,
xbt_assert((route.src_gateway != NULL) && (route.dst_gateway != NULL),
"bad gateways for route from \"%s\" to \"%s\"", src, dst);
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;
char*src_gateway = route.src_gateway;
char*dst_gateway = route.dst_gateway;
@@
-564,8
+564,11
@@
static void _get_route_and_latency(const char *src, const char *dst,
xbt_dynar_push(*links, &link);
}
xbt_dynar_free(&route_dst);
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);
}
/**
}
/**
@@
-585,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)
{
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);
}
_get_route_and_latency(src, dst, route, latency);
@@
-661,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->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;
}
/* no current routing at moment */
current_routing = NULL;
}
@@
-1144,6
+1144,7
@@
static void finalize_rec(AS_t as) {
void routing_exit(void) {
if (!global_routing)
return;
void routing_exit(void) {
if (!global_routing)
return;
+ xbt_dynar_free(&global_routing->last_route);
finalize_rec(global_routing->root);
xbt_free(global_routing);
}
finalize_rec(global_routing->root);
xbt_free(global_routing);
}