UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

perf test: Fix memory leaks in parse-metric test 

It didn't release resources when there's an error so the
test_recursion_fail() will leak some memory.

Fixes: 0a507af9c6 ("perf tests: Add parse metric test for ipc metric")
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Acked-by: Jiri Olsa <jolsa@redhat.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lore.kernel.org/lkml/20200915031819.386559-7-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Namhyung Kim 2020-09-15 12:18:14 +09:00 committed by Arnaldo Carvalho de Melo
parent b12eea5ad8
commit f5a56570a3
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tools/perf/tests/parse-metric.c
View File

@ -153,8 +153,10 @@ static int __compute_metric(const char *name, struct value *vals,
return -ENOMEM; return -ENOMEM;
cpus = perf_cpu_map__new("0"); cpus = perf_cpu_map__new("0");
if (!cpus) if (!cpus) {
evlist__delete(evlist);
return -ENOMEM; return -ENOMEM;
}
perf_evlist__set_maps(&evlist->core, cpus, NULL); perf_evlist__set_maps(&evlist->core, cpus, NULL);
@ -163,10 +165,11 @@ static int __compute_metric(const char *name, struct value *vals,
false, false, false, false,
&metric_events); &metric_events);
if (err) if (err)
return err; goto out;
if (perf_evlist__alloc_stats(evlist, false)) err = perf_evlist__alloc_stats(evlist, false);
return -1; if (err)
goto out;
/* Load the runtime stats with given numbers for events. */ /* Load the runtime stats with given numbers for events. */
runtime_stat__init(&st); runtime_stat__init(&st);
@ -178,13 +181,14 @@ static int __compute_metric(const char *name, struct value *vals,
if (name2 && ratio2) if (name2 && ratio2)
*ratio2 = compute_single(&metric_events, evlist, &st, name2); *ratio2 = compute_single(&metric_events, evlist, &st, name2);
out:
/* ... clenup. */ /* ... clenup. */
metricgroup__rblist_exit(&metric_events); metricgroup__rblist_exit(&metric_events);
runtime_stat__exit(&st); runtime_stat__exit(&st);
perf_evlist__free_stats(evlist); perf_evlist__free_stats(evlist);
perf_cpu_map__put(cpus); perf_cpu_map__put(cpus);
evlist__delete(evlist); evlist__delete(evlist);
return 0; return err;
} }
static int compute_metric(const char *name, struct value *vals, double *ratio) static int compute_metric(const char *name, struct value *vals, double *ratio)