perf trace: Make evlist__set_evsel_handler() affect just entries without a handler
A message that is not in the archive (sent off-list or not yet received): [email protected]
The following commit has been merged into the perf/core branch of tip:
Commit-ID: 206d635aa594a5246cd181b3be39d1e3b2126f68 Gitweb: https://git.kernel.org/tip/206d635aa594a5246cd181b3be39d1e3b2126f68 Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Tue, 01 Oct 2019 11:31:59 -03:00 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitterDate: Mon, 07 Oct 2019 12:22:17 -03:00
perf trace: Make evlist__set_evsel_handler() affect just entries without a handler
Renaming it to evlist__set_default_evsel_handler(), to better reflect what we want to do, which is to set a default handler for events we still haven't set a custom handler, like the ones for "msr:write_msr", etc that are coming soon.
Cc Adrian Hunter <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Namhyung Kim <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/builtin-trace.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
tools/perf/builtin-trace.c +6 -4
@@ -3858,12 +3858,14 @@ static int parse_pagefaults(const struct option *opt, const char *str,return 0 ; } -static void evlist__set_evsel_handler (struct evlist *evlist,void *handler) +static void evlist__set_default_evsel_handler (struct evlist *evlist,void *handler) {struct evsel *evsel; -evlist__for_each_entry (evlist, evsel) - evsel->handler = handler; +evlist__for_each_entry (evlist, evsel) { +if (evsel->handler ==NULL ) + evsel->handler = handler; + } }static int evlist__set_syscall_tp_fields (struct evlist *evlist)
@@ -4287,7 +4289,7 @@ int cmd_trace(int argc, const char **argv) }if (trace.evlist->core.nr_entries >0 ) { -evlist__set_evsel_handler (trace.evlist, trace__event_handler); +evlist__set_default_evsel_handler (trace.evlist, trace__event_handler);if (evlist__set_syscall_tp_fields (trace.evlist)) {perror ("failed to set syscalls:* tracepoint fields" ); goto out;