diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2014-01-03 16:54:12 -0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2014-01-13 10:06:22 -0300 |
| commit | f26e1c7cb279051d83e0b671f48b30fe88c2c788 (patch) | |
| tree | 9f580f4038fdcd9b55ad168bcd7fe864262637ce /tools/perf/builtin-trace.c | |
| parent | 03ad9747c5f2169556467101e96bc390c5aa4b83 (diff) | |
| download | op-kernel-dev-f26e1c7cb279051d83e0b671f48b30fe88c2c788.zip op-kernel-dev-f26e1c7cb279051d83e0b671f48b30fe88c2c788.tar.gz | |
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/builtin-trace.c')
| -rw-r--r-- | tools/perf/builtin-trace.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c index f4ddd14..aa8a5f4 100644 --- a/tools/perf/builtin-trace.c +++ b/tools/perf/builtin-trace.c @@ -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: |
