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

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

perf evlist: Auto unmap on destructor 

Removing further boilerplate after making sure perf_evlist__munmap can
be called multiple times for the same evlist.

Cc: Adrian Hunter <adrian.hunter@intel.com>
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@kernel.org>
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-o0luenuld4abupm4nmrgzm6f@git.kernel.org


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

tools/perf/builtin-record.c

+0 −2
Original line number Diff line number Diff line
@@ -968,8 +968,6 @@ int cmd_record(int argc, const char **argv, const char *prefix __maybe_unused) 
	}



	err = __cmd_record(&record, argc, argv);



	perf_evlist__munmap(rec->evlist);

out_symbol_exit:

	symbol__exit();

	return err;

tools/perf/builtin-trace.c

+0 −1
Original line number Diff line number Diff line
@@ -1993,7 +1993,6 @@ static int trace__run(struct trace *trace, int argc, const char **argv) 
		}

	}



	perf_evlist__munmap(evlist);

out_delete_evlist:

	perf_evlist__delete(evlist);

out:

tools/perf/tests/code-reading.c

+0 −1
Original line number Diff line number Diff line
@@ -540,7 +540,6 @@ static int do_test_code_reading(bool try_kcore) 
		err = TEST_CODE_READING_OK;

out_err:

	if (evlist) {

		perf_evlist__munmap(evlist);

		perf_evlist__delete(evlist);

	} else {

		cpu_map__delete(cpus);

tools/perf/tests/keep-tracking.c

+0 −1
Original line number Diff line number Diff line
@@ -142,7 +142,6 @@ int test__keep_tracking(void) 
out_err:

	if (evlist) {

		perf_evlist__disable(evlist);

		perf_evlist__munmap(evlist);

		perf_evlist__delete(evlist);

	} else {

		cpu_map__delete(cpus);

tools/perf/tests/mmap-basic.c

+4 −6
Original line number Diff line number Diff line
@@ -105,13 +105,13 @@ int test__basic_mmap(void) 
		if (event->header.type != PERF_RECORD_SAMPLE) {

			pr_debug("unexpected %s event\n",

				 perf_event__name(event->header.type));

			goto out_munmap;

			goto out_delete_evlist;

		}



		err = perf_evlist__parse_sample(evlist, event, &sample);

		if (err) {

			pr_err("Can't parse sample, err = %d\n", err);

			goto out_munmap;

			goto out_delete_evlist;

		}



		err = -1;
@@ -119,7 +119,7 @@ int test__basic_mmap(void) 
		if (evsel == NULL) {

			pr_debug("event with id %" PRIu64

				 " doesn't map to an evsel\n", sample.id);

			goto out_munmap;

			goto out_delete_evlist;

		}

		nr_events[evsel->idx]++;

		perf_evlist__mmap_consume(evlist, 0);
@@ -132,12 +132,10 @@ int test__basic_mmap(void) 
				 expected_nr_events[evsel->idx],

				 perf_evsel__name(evsel), nr_events[evsel->idx]);

			err = -1;

			goto out_munmap;

			goto out_delete_evlist;

		}

	}



out_munmap:

	perf_evlist__munmap(evlist);

out_delete_evlist:

	perf_evlist__delete(evlist);

	cpus	= NULL;