From 65e338fbfd769d49b29242bfe56cde18c03b6074 Mon Sep 17 00:00:00 2001 From: navarrop Date: Tue, 28 Sep 2010 08:52:31 +0000 Subject: [PATCH] pre version hierarchical routing, fix memory leak git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@8234 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- src/surf/surf_routing.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c index 8f39511de2..07421a773e 100644 --- a/src/surf/surf_routing.c +++ b/src/surf/surf_routing.c @@ -232,7 +232,7 @@ static void parse_S_AS(void) { for (cpt=0;routing_models[cpt].name;cpt++) if (!strcmp(wanted,routing_models[cpt].name)) fprintf(stderr," %s: %s\n",routing_models[cpt].name,routing_models[cpt].desc); - exit(1); + xbt_die(NULL); } /* make a new routing component */ @@ -437,6 +437,8 @@ static route_extended_t _get_route(const char* src,const char* dst) { xbt_dynar_foreach(e_route_cnt->generic_route.link_list, cpt, link) { xbt_dynar_push(e_route->generic_route.link_list,&link); } + xbt_dynar_free( &(e_route_cnt->generic_route.link_list) ); + xbt_free(e_route_cnt); } } else { /* SURF_ROUTING_RECURSIVE */ @@ -506,6 +508,7 @@ static xbt_dynar_t get_route(const char* src,const char* dst) { global_routing->last_route = e_route->generic_route.link_list; xbt_free(e_route); + xbt_dynar_free(&elem_father_list); if( xbt_dynar_length(global_routing->last_route)==0 ) return NULL; -- 2.20.1