diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2014-01-03 14:54:12 -0500 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2014-01-13 08:06:22 -0500 |
commit | f26e1c7cb279051d83e0b671f48b30fe88c2c788 (patch) | |
tree | 9f580f4038fdcd9b55ad168bcd7fe864262637ce /tools/perf/tests/task-exit.c | |
parent | 03ad9747c5f2169556467101e96bc390c5aa4b83 (diff) |
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>
Diffstat (limited to 'tools/perf/tests/task-exit.c')
-rw-r--r-- | tools/perf/tests/task-exit.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/tools/perf/tests/task-exit.c b/tools/perf/tests/task-exit.c index fdeb2aa46a50..5511a0a929cd 100644 --- a/tools/perf/tests/task-exit.c +++ b/tools/perf/tests/task-exit.c | |||
@@ -89,7 +89,7 @@ int test__task_exit(void) | |||
89 | if (perf_evlist__mmap(evlist, 128, true) < 0) { | 89 | if (perf_evlist__mmap(evlist, 128, true) < 0) { |
90 | pr_debug("failed to mmap events: %d (%s)\n", errno, | 90 | pr_debug("failed to mmap events: %d (%s)\n", errno, |
91 | strerror(errno)); | 91 | strerror(errno)); |
92 | goto out_close_evlist; | 92 | goto out_delete_evlist; |
93 | } | 93 | } |
94 | 94 | ||
95 | perf_evlist__start_workload(evlist); | 95 | perf_evlist__start_workload(evlist); |
@@ -113,8 +113,6 @@ retry: | |||
113 | } | 113 | } |
114 | 114 | ||
115 | perf_evlist__munmap(evlist); | 115 | perf_evlist__munmap(evlist); |
116 | out_close_evlist: | ||
117 | perf_evlist__close(evlist); | ||
118 | out_delete_evlist: | 116 | out_delete_evlist: |
119 | perf_evlist__delete(evlist); | 117 | perf_evlist__delete(evlist); |
120 | return err; | 118 | return err; |