Re: [PATCH 06/11] perf test: Fix memory leaks in parse-metric test

Arnaldo Carvalho de Melo
2020-09-15T12:27:24Z

Em Tue, Sep 15, 2020 at 12:18:14PM +0900, Namhyung Kim escreveu:
> It didn't release resources when there's an error so the
> test_recursion_fail() will leak some memory.

Thanks, applied.

- Arnaldo
>
> Acked-by: Jiri Olsa <jolsa@redhat.com>
> Fixes: 0a507af9c681a ("perf tests: Add parse metric test for ipc metric")
> Signed-off-by: Namhyung Kim <namhyung@kernel.org>
> ---
> tools/perf/tests/parse-metric.c | 14 +++++++++-----
> 1 file changed, 9 insertions(+), 5 deletions(-)
>
> diff --git a/tools/perf/tests/parse-metric.c b/tools/perf/tests/parse-metric.c
> index 23db8acc492d..cd7331aac3bd 100644
> --- a/tools/perf/tests/parse-metric.c
> +++ b/tools/perf/tests/parse-metric.c
> @@ -153,8 +153,10 @@ static int __compute_metric(const char *name, struct value *vals,
> return -ENOMEM;
>
> cpus = perf_cpu_map__new("0");
> - if (!cpus)
> + if (!cpus) {
> + evlist__delete(evlist);
> return -ENOMEM;
> + }
>
> perf_evlist__set_maps(&evlist->core, cpus, NULL);
>
> @@ -163,10 +165,11 @@ static int __compute_metric(const char *name, struct value *vals,
> false, false,
> &metric_events);
> if (err)
> - return err;
> + goto out;
>
> - if (perf_evlist__alloc_stats(evlist, false))
> - return -1;
> + err = perf_evlist__alloc_stats(evlist, false);
> + if (err)
> + goto out;
>
> /* Load the runtime stats with given numbers for events. */
> runtime_stat__init(&st);
> @@ -178,13 +181,14 @@ static int __compute_metric(const char *name, struct value *vals,
> if (name2 && ratio2)
> *ratio2 = compute_single(&metric_events, evlist, &st, name2);
>
> +out:
> /* ... clenup. */
> metricgroup__rblist_exit(&metric_events);
> runtime_stat__exit(&st);
> perf_evlist__free_stats(evlist);
> perf_cpu_map__put(cpus);
> evlist__delete(evlist);
> - return 0;
> + return err;
> }
>
> static int compute_metric(const char *name, struct value *vals, double *ratio)
> --
> 2.28.0.618.gf4bc123cb7-goog
>

--

- Arnaldo