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: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user