Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ec13abc3 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

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 <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-t3181qy15avffdacqjcxfku2@git.kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent c0aab59f

tools/perf/tests/perf-record.c

+7 −5
Original line number Diff line number Diff line
@@ -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 @@ int test__PERF_RECORD(void) 
	}

out_err:

	perf_evlist__munmap(evlist);

out_delete_maps:

	perf_evlist__delete_maps(evlist);

out_delete_evlist:

	perf_evlist__delete(evlist);

out: