perf evswitch: Introduce OPTS_EVSWITCH() for cmd line processing

All tools will want those, so provide a convenient way to get them.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Florian Weimer <fweimer@redhat.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: William Cohen <wcohen@redhat.com>
Link: https://lkml.kernel.org/n/tip-v16pe3sbf3wjmn152u18f649@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c
index 177e4e91b1995450dcbd0cb778828e505178afaa..2a5b8af80e6b2da539676dc1aaac42bd08156c51 100644 (file)
--- a/tools/perf/builtin-script.c
+++ b/tools/perf/builtin-script.c
@@ -3543,12 +3543,7 @@ int cmd_script(int argc, const char **argv)
                   "file", "file saving guest os /proc/kallsyms"),
        OPT_STRING(0, "guestmodules", &symbol_conf.default_guest_modules,
                   "file", "file saving guest os /proc/modules"),
-       OPT_STRING(0, "switch-on", &script.evswitch.on_name,
-                  "event", "Consider events after the ocurrence of this event"),
-       OPT_STRING(0, "switch-off", &script.evswitch.off_name,
-                  "event", "Stop considering events after the ocurrence of this event"),
-       OPT_BOOLEAN(0, "show-on-off-events", &script.evswitch.show_on_off_events,
-                   "Show the on/off switch events, used with --switch-on"),
+       OPTS_EVSWITCH(&script.evswitch),
        OPT_END()
        };
        const char * const script_subcommands[] = { "record", "report", NULL };

diff --git a/tools/perf/util/evswitch.h b/tools/perf/util/evswitch.h
index 891164504080b52f4a4d6ccf85d3629c46798a0f..94220d1bb4796d1c61884011d0d596a4ca2b9a54 100644 (file)
--- a/tools/perf/util/evswitch.h
+++ b/tools/perf/util/evswitch.h
@@ -16,4 +16,12 @@ struct evswitch {
 
 bool evswitch__discard(struct evswitch *evswitch, struct evsel *evsel);
 
+#define OPTS_EVSWITCH(evswitch)                                                                  \
+       OPT_STRING(0, "switch-on", &(evswitch)->on_name,                                  \
+                  "event", "Consider events after the ocurrence of this event"),         \
+       OPT_STRING(0, "switch-off", &(evswitch)->off_name,                                \
+                  "event", "Stop considering events after the ocurrence of this event"), \
+       OPT_BOOLEAN(0, "show-on-off-events", &(evswitch)->show_on_off_events,             \
+                   "Show the on/off switch events, used with --switch-on and --switch-off")
+
 #endif /* __PERF_EVSWITCH_H */