perf tests: Fix leaks on PERF_RECORD_* test
Commit-ID: ec13abc37f71c89189350dce491189fb5b659184 Gitweb: http://git.kernel.org/tip/ec13abc37f71c89189350dce491189fb5b659184 Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Fri, 25 Jan 2013 13:10:00 -0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Wed, 30 Jan 2013 10:35:02 -0300
perf tests: Fix leaks on PERF_RECORD_* test
This test:
7: Validate PERF_RECORD_* events & perf_sample fields
needs to call perf_evlist__delete_maps().
Cc David Ahern <[email protected]>
Cc Frederic Weisbecker <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Mike Galbraith <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Stephane Eranian <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/tests/perf-record.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
tools/perf/tests/perf-record.c +7 -5
@@ -96,7 +96,7 @@ int test__PERF_RECORD(void) err =perf_evlist__prepare_workload (evlist, &opts, argv);if (err <0 ) {pr_debug ("Couldn't run the workload!\n" ); - goto out_delete_evlist; + goto out_delete_maps; }/*
@@ -111,7 +111,7 @@ int test__PERF_RECORD(void) err =sched__get_first_possible_cpu (evlist->workload.pid, &cpu_mask);if (err <0 ) {pr_debug ("sched__get_first_possible_cpu: %s\n" ,strerror (errno)); - goto out_delete_evlist; + goto out_delete_maps; } cpu = err;
@@ -121,7 +121,7 @@ int test__PERF_RECORD(void)*/ if (sched_setaffinity (evlist->workload.pid, cpu_mask_size, &cpu_mask) <0 ) {pr_debug ("sched_setaffinity: %s\n" ,strerror (errno)); - goto out_delete_evlist; + goto out_delete_maps; }/*
@@ -131,7 +131,7 @@ int test__PERF_RECORD(void) err =perf_evlist__open (evlist);if (err <0 ) {pr_debug ("perf_evlist__open: %s\n" ,strerror (errno)); - goto out_delete_evlist; + goto out_delete_maps; }/*
@@ -142,7 +142,7 @@ int test__PERF_RECORD(void) err =perf_evlist__mmap (evlist, opts.mmap_pages, false);if (err <0 ) {pr_debug ("perf_evlist__mmap: %s\n" ,strerror (errno)); - goto out_delete_evlist; + goto out_delete_maps; }/*
@@ -305,6 +305,8 @@ found_exit: } out_err:perf_evlist__munmap (evlist); +out_delete_maps: +perf_evlist__delete_maps (evlist); out_delete_evlist:perf_evlist__delete (evlist); out: