diff options
| author | Adrian Hunter | 2021-06-21 18:05:05 +0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo | 2021-06-22 15:18:15 -0300 |
| commit | 4371fbc0c9c4bcd812e96bafd54a666c330292e8 (patch) | |
| tree | 2cf4817a12985a4da9849cd5434a069877723fd1 /tools/perf | |
| parent | 9300041c661dacc0b4036f29315cef6008bc940d (diff) | |
perf script: Move filtering before scripting
To make it possible to use filtering with scripts, move filtering before
scripting.
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Leo Yan <leo.yan@linaro.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lore.kernel.org/lkml/20210621150514.32159-3-adrian.hunter@intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf')
| -rw-r--r-- | tools/perf/builtin-script.c | 12 |
1 files 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; |