From 200fb4cf89cf885b36a52cfaeb21c2d763ab5cb9 Mon Sep 17 00:00:00 2001 From: alegrand Date: Wed, 18 Jun 2008 15:54:00 +0000 Subject: [PATCH 1/1] Plug a memleak. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@5755 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- src/surf/cpu.c | 1 + src/surf/network.c | 1 + src/surf/network_gtnets.c | 3 ++- src/surf/workstation_ptask_L07.c | 2 ++ 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/surf/cpu.c b/src/surf/cpu.c index 941b213a84..f300667961 100644 --- a/src/surf/cpu.c +++ b/src/surf/cpu.c @@ -19,6 +19,7 @@ static xbt_swag_t running_action_set_that_does_not_need_being_checked = NULL; static void cpu_free(void *cpu) { free(((cpu_Cas01_t) cpu)->name); + xbt_dict_free(&(((cpu_Cas01_t)cpu)->properties)); free(cpu); } diff --git a/src/surf/network.c b/src/surf/network.c index 852da9ad3d..32d04827c2 100644 --- a/src/surf/network.c +++ b/src/surf/network.c @@ -34,6 +34,7 @@ static void create_routing_table(void) static void link_free(void *nw_link) { free(((link_CM02_t) nw_link)->name); + xbt_dict_free(&(((link_CM02_t)nw_link)->properties)); free(nw_link); } diff --git a/src/surf/network_gtnets.c b/src/surf/network_gtnets.c index 8804e19d13..e76efeff50 100644 --- a/src/surf/network_gtnets.c +++ b/src/surf/network_gtnets.c @@ -26,6 +26,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_network_gtnets, surf, static void link_free(void *nw_link) { free(((network_link_GTNETS_t) nw_link)->name); + xbt_dict_free(&(((network_link_GTNETS_t)nw_link)->properties)); free(nw_link); } @@ -75,7 +76,7 @@ static void link_new(char *name, double bw, double lat, xbt_dict_t props) gtnets_link->lat_current = lat; gtnets_link->id = link_count; /* Add the properties */ - gtnets_link->properties = current_property_set; + gtnets_link->properties = props; xbt_dict_set(link_set, name, gtnets_link, link_free); diff --git a/src/surf/workstation_ptask_L07.c b/src/surf/workstation_ptask_L07.c index 34468c7d0b..4988bd8db8 100644 --- a/src/surf/workstation_ptask_L07.c +++ b/src/surf/workstation_ptask_L07.c @@ -673,6 +673,7 @@ static double get_link_latency(const void *link) static void cpu_free(void *cpu) { free(((cpu_L07_t) cpu)->name); + xbt_dict_free(&(((cpu_L07_t)cpu)->properties)); free(cpu); } @@ -751,6 +752,7 @@ static void parse_cpu_init(void) static void link_free(void *nw_link) { free(((link_L07_t) nw_link)->name); + xbt_dict_free(&(((link_L07_t)nw_link)->properties)); free(nw_link); } -- 2.20.1