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/builtin-record.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/builtin-record.c')
-rw-r--r-- | tools/perf/builtin-record.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index 6dcb8aae908c..5149b41e63d1 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c | |||
@@ -964,15 +964,13 @@ int cmd_record(int argc, const char **argv, const char *prefix __maybe_unused) | |||
964 | 964 | ||
965 | if (record_opts__config(&rec->opts)) { | 965 | if (record_opts__config(&rec->opts)) { |
966 | err = -EINVAL; | 966 | err = -EINVAL; |
967 | goto out_free_fd; | 967 | goto out_symbol_exit; |
968 | } | 968 | } |
969 | 969 | ||
970 | err = __cmd_record(&record, argc, argv); | 970 | err = __cmd_record(&record, argc, argv); |
971 | 971 | ||
972 | perf_evlist__munmap(rec->evlist); | 972 | perf_evlist__munmap(rec->evlist); |
973 | perf_evlist__close(rec->evlist); | 973 | perf_evlist__close(rec->evlist); |
974 | out_free_fd: | ||
975 | perf_evlist__delete_maps(rec->evlist); | ||
976 | out_symbol_exit: | 974 | out_symbol_exit: |
977 | symbol__exit(); | 975 | symbol__exit(); |
978 | return err; | 976 | return err; |