diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2014-01-03 13:56:06 -0500 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2014-01-13 08:06:21 -0500 |
commit | 03ad9747c5f2169556467101e96bc390c5aa4b83 (patch) | |
tree | c60f2e8ad184a10ed493de0d6db07d2f03aae130 /tools/perf/tests/open-syscall-tp-fields.c | |
parent | 3e2be2da8f76ef5b2e8e59c3dc8acd24640b4af4 (diff) |
perf evlist: Move destruction of maps to evlist destructor
Instead of requiring tools to do an extra destructor call just before
calling perf_evlist__delete.
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-0jd2ptzyikxb5wp7inzz2ah2@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/tests/open-syscall-tp-fields.c')
-rw-r--r-- | tools/perf/tests/open-syscall-tp-fields.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/tools/perf/tests/open-syscall-tp-fields.c b/tools/perf/tests/open-syscall-tp-fields.c index 774620a5aecb..595b577172a6 100644 --- a/tools/perf/tests/open-syscall-tp-fields.c +++ b/tools/perf/tests/open-syscall-tp-fields.c | |||
@@ -48,7 +48,7 @@ int test__syscall_open_tp_fields(void) | |||
48 | err = perf_evlist__open(evlist); | 48 | err = perf_evlist__open(evlist); |
49 | if (err < 0) { | 49 | if (err < 0) { |
50 | pr_debug("perf_evlist__open: %s\n", strerror(errno)); | 50 | pr_debug("perf_evlist__open: %s\n", strerror(errno)); |
51 | goto out_delete_maps; | 51 | goto out_delete_evlist; |
52 | } | 52 | } |
53 | 53 | ||
54 | err = perf_evlist__mmap(evlist, UINT_MAX, false); | 54 | err = perf_evlist__mmap(evlist, UINT_MAX, false); |
@@ -114,8 +114,6 @@ out_munmap: | |||
114 | perf_evlist__munmap(evlist); | 114 | perf_evlist__munmap(evlist); |
115 | out_close_evlist: | 115 | out_close_evlist: |
116 | perf_evlist__close(evlist); | 116 | perf_evlist__close(evlist); |
117 | out_delete_maps: | ||
118 | perf_evlist__delete_maps(evlist); | ||
119 | out_delete_evlist: | 117 | out_delete_evlist: |
120 | perf_evlist__delete(evlist); | 118 | perf_evlist__delete(evlist); |
121 | out: | 119 | out: |