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

perf evlist: Close fds on destructor 

Since it is safe to call perf_evlist__close() multiple times, autoclose
it and remove the calls to the close from existing tools, reducing the
tooling boilerplate.

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-2kq9v7p1rude1tqxa0aue2tk@git.kernel.org


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

tools/perf/builtin-record.c

+0 −1
Original line number Diff line number Diff line
@@ -970,7 +970,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);

	perf_evlist__close(rec->evlist);

out_symbol_exit:

	symbol__exit();

	return err;

tools/perf/builtin-trace.c

+1 −3
Original line number Diff line number Diff line
@@ -1909,7 +1909,7 @@ static int trace__run(struct trace *trace, int argc, const char **argv) 
	err = perf_evlist__mmap(evlist, trace->opts.mmap_pages, false);

	if (err < 0) {

		fprintf(trace->output, "Couldn't mmap the events: %s\n", strerror(errno));

		goto out_close_evlist;

		goto out_delete_evlist;

	}



	perf_evlist__enable(evlist);
@@ -1994,8 +1994,6 @@ out_disable: 
	}



	perf_evlist__munmap(evlist);

out_close_evlist:

	perf_evlist__close(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
@@ -541,7 +541,6 @@ static int do_test_code_reading(bool try_kcore) 
out_err:

	if (evlist) {

		perf_evlist__munmap(evlist);

		perf_evlist__close(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
@@ -143,7 +143,6 @@ out_err: 
	if (evlist) {

		perf_evlist__disable(evlist);

		perf_evlist__munmap(evlist);

		perf_evlist__close(evlist);

		perf_evlist__delete(evlist);

	} else {

		cpu_map__delete(cpus);

tools/perf/tests/mmap-basic.c

+4 −7
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ int test__basic_mmap(void) 
		evsels[i] = perf_evsel__newtp("syscalls", name);

		if (evsels[i] == NULL) {

			pr_debug("perf_evsel__new\n");

			goto out_free_evlist;

			goto out_delete_evlist;

		}



		evsels[i]->attr.wakeup_events = 1;
@@ -80,7 +80,7 @@ int test__basic_mmap(void) 
			pr_debug("failed to open counter: %s, "

				 "tweak /proc/sys/kernel/perf_event_paranoid?\n",

				 strerror(errno));

			goto out_close_fd;

			goto out_delete_evlist;

		}



		nr_events[i] = 0;
@@ -90,7 +90,7 @@ int test__basic_mmap(void) 
	if (perf_evlist__mmap(evlist, 128, true) < 0) {

		pr_debug("failed to mmap events: %d (%s)\n", errno,

			 strerror(errno));

		goto out_close_fd;

		goto out_delete_evlist;

	}



	for (i = 0; i < nsyscalls; ++i)
@@ -138,10 +138,7 @@ int test__basic_mmap(void) 


out_munmap:

	perf_evlist__munmap(evlist);

out_close_fd:

	for (i = 0; i < nsyscalls; ++i)

		perf_evsel__close_fd(evsels[i], 1, threads->nr);

out_free_evlist:

out_delete_evlist:

	perf_evlist__delete(evlist);

	cpus	= NULL;

	threads = NULL;

CRA Git | Maintained and supported by SUSTech CRA and CCSE