Messages in this thread Patch in this message | | | Date | Thu, 6 Nov 2014 21:32:29 -0800 | From | tip-bot for Jiri Olsa <> | Subject | [tip:perf/core] perf evsel: Do not call pevent_free_format when deleting tracepoint |
| |
Commit-ID: daa01794a4a36a1da1b09a529adec0c8c0b94ab2 Gitweb: http://git.kernel.org/tip/daa01794a4a36a1da1b09a529adec0c8c0b94ab2 Author: Jiri Olsa <jolsa@kernel.org> AuthorDate: Tue, 4 Nov 2014 11:55:38 +0100 Committer: Arnaldo Carvalho de Melo <acme@redhat.com> CommitDate: Thu, 6 Nov 2014 17:47:14 -0300
perf evsel: Do not call pevent_free_format when deleting tracepoint
The libtraceevent library's main handle 'struct pevent' holds pointers of every event that was added to it via functions:
pevent_parse_format pevent_parse_event
We can't release struct event_format (call pevent_free_format) separately, because that breaks that pointers array mentioned above and another add_event call could end up with segfault.
All added events are released within the handle cleanup in pevent_free.
Signed-off-by: Jiri Olsa <jolsa@kernel.org> Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com> Cc: David Ahern <dsahern@gmail.com> Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Ingo Molnar <mingo@kernel.org> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Paul Mackerras <paulus@samba.org> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Steven Rostedt <rostedt@goodmis.org> Link: http://lkml.kernel.org/r/1415098538-1512-1-git-send-email-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> --- tools/perf/util/evsel.c | 2 -- 1 file changed, 2 deletions(-)
diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c index 2f9e680..12b4396 100644 --- a/tools/perf/util/evsel.c +++ b/tools/perf/util/evsel.c @@ -853,8 +853,6 @@ void perf_evsel__exit(struct perf_evsel *evsel) perf_evsel__free_id(evsel); close_cgroup(evsel->cgrp); zfree(&evsel->group_name); - if (evsel->tp_format) - pevent_free_format(evsel->tp_format); zfree(&evsel->name); perf_evsel__object.fini(evsel); }
| |