[PATCH RFC 02/11] perf script: Move filtering before scripting
From: Adrian Hunter <adrian.hunter@intel.com>
Date: 2021-06-21 15:05:06
Also in:
lkml
Subsystem:
performance events subsystem, the rest · Maintainers:
Peter Zijlstra, Ingo Molnar, Arnaldo Carvalho de Melo, Namhyung Kim, Linus Torvalds
To make it possible to use filtering with scripts, move filtering before scripting. Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> --- tools/perf/builtin-script.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c
index 08a2b5d51018..ff7b43899f2e 100644
--- a/tools/perf/builtin-script.c
+++ b/tools/perf/builtin-script.c@@ -1984,12 +1984,6 @@ static void process_event(struct perf_script *script, if (output[type].fields == 0) return; - if (!show_event(sample, evsel, thread, al)) - return; - - if (evswitch__discard(&script->evswitch, evsel)) - return; - ++es->samples; perf_sample__fprintf_start(script, sample, thread, evsel,
@@ -2203,6 +2197,12 @@ static int process_sample_event(struct perf_tool *tool, if (al.filtered) goto out_put; + if (!show_event(sample, evsel, al.thread, &al)) + goto out_put; + + if (evswitch__discard(&scr->evswitch, evsel)) + goto out_put; + if (scripting_ops) { struct addr_location *addr_al_ptr = NULL; struct addr_location addr_al;
--
2.17.1