2 files changed, 27 insertions, 0 deletions

diff --git a/tools/perf/Documentation/perf-report.txt b/tools/perf/Documentation/perf-report.txt
index 987261d158d4..7315f155803f 100644
--- a/tools/perf/Documentation/perf-report.txt
+++ b/tools/perf/Documentation/perf-report.txt
@@ -438,6 +438,23 @@ OPTIONS
 
           perf report --time 0%-10%,30%-40%
 
+--switch-on EVENT_NAME::
+        Only consider events after this event is found.
+
+        This may be interesting to measure a workload only after some initialization
+        phase is over, i.e. insert a perf probe at that point and then using this
+        option with that probe.
+
+--switch-off EVENT_NAME::
+        Stop considering events after this event is found.
+
+--show-on-off-events::
+        Show the --switch-on/off events too. This has no effect in 'perf report' now
+        but probably we'll make the default not to show the switch-on/off events
+        on the --group mode and if there is only one event besides the off/on ones,
+        go straight to the histogram browser, just like 'perf report' with no events
+        explicitely specified does.
+
 --itrace::
         Options for decoding instruction tracing data. The options are:
 
diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
index d4288dcce156..5e003d02821e 100644
--- a/tools/perf/builtin-report.c
+++ b/tools/perf/builtin-report.c
@@ -25,6 +25,7 @@
 #include "util/debug.h"
 #include "util/evlist.h"
 #include "util/evsel.h"
+#include "util/evswitch.h"
 #include "util/header.h"
 #include "util/session.h"
 #include "util/tool.h"
@@ -60,6 +61,7 @@
 struct report {
         struct perf_tool        tool;
         struct perf_session     *session;
+        struct evswitch         evswitch;
         bool                    use_tui, use_gtk, use_stdio;
         bool                    show_full_info;
         bool                    show_threads;
@@ -243,6 +245,9 @@ static int process_sample_event(struct perf_tool *tool,
                 return 0;
         }
 
+        if (evswitch__discard(&rep->evswitch, evsel))
+                return 0;
+
         if (machine__resolve(machine, &al, sample) < 0) {
                 pr_debug("problem processing %d event, skipping it.\n",
                          event->header.type);
@@ -1189,6 +1194,7 @@ int cmd_report(int argc, const char **argv)
         OPT_CALLBACK(0, "time-quantum", &symbol_conf.time_quantum, "time (ms|us|ns|s)",
                      "Set time quantum for time sort key (default 100ms)",
                      parse_time_quantum),
+        OPTS_EVSWITCH(&report.evswitch),
         OPT_END()
         };
         struct perf_data data = {
@@ -1257,6 +1263,10 @@ repeat:
         if (session == NULL)
                 return -1;
 
+        ret = evswitch__init(&report.evswitch, session->evlist, stderr);
+        if (ret)
+                return ret;
+
         if (zstd_init(&(session->zstd_data), 0) < 0)
                 pr_warning("Decompression initialization failed. Reported data may be incomplete.\n");