From 5f7cb0de7ed8d52f3314e7e187dd2c0112187445 Mon Sep 17 00:00:00 2001 From: Augustin Degomme Date: Mon, 23 Sep 2013 17:58:13 +0200 Subject: [PATCH] remove leaks from energy --- src/surf/cpu_cas01.c | 7 +++++-- src/surf/surfxml_parse.c | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/surf/cpu_cas01.c b/src/surf/cpu_cas01.c index 671f363936..9090cb437d 100644 --- a/src/surf/cpu_cas01.c +++ b/src/surf/cpu_cas01.c @@ -174,7 +174,7 @@ static void cpu_update_actions_state_full(double now, double delta) xbt_dynar_t cpu_get_watts_range_list(cpu_Cas01_t cpu_model) { - xbt_dynar_t power_range_list = xbt_dynar_new(sizeof(xbt_dynar_t), NULL); + xbt_dynar_t power_range_list; xbt_dynar_t power_tuple; int i = 0, pstate_nb=0; xbt_dynar_t current_power_values; @@ -189,6 +189,8 @@ xbt_dynar_t cpu_get_watts_range_list(cpu_Cas01_t cpu_model) if (all_power_values_str == NULL) return NULL; + + power_range_list = xbt_dynar_new(sizeof(xbt_dynar_t), NULL); xbt_dynar_t all_power_values = xbt_str_split(all_power_values_str, ","); pstate_nb = xbt_dynar_length(all_power_values); @@ -210,8 +212,9 @@ xbt_dynar_t cpu_get_watts_range_list(cpu_Cas01_t cpu_model) xbt_dynar_push_as(power_tuple, double, max_power); xbt_dynar_push_as(power_range_list, xbt_dynar_t, power_tuple); + xbt_dynar_free(¤t_power_values); } - + xbt_dynar_free(&all_power_values); return power_range_list; } diff --git a/src/surf/surfxml_parse.c b/src/surf/surfxml_parse.c index e496ca4611..ee3c95f3e9 100644 --- a/src/surf/surfxml_parse.c +++ b/src/surf/surfxml_parse.c @@ -449,6 +449,7 @@ void ETag_surfxml_host(void) { xbt_dynar_push_as(host.power_peak, double, power_value); XBT_DEBUG("Power value: %lf", power_value); } + xbt_dynar_free(&pstate_list); } XBT_DEBUG("pstate: %s", A_surfxml_host_pstate); -- 2.20.1