bianbu-repo-mirror/bianbu-linux-6.6
1
0
Fork 0
mirror of https://gitee.com/bianbu-linux/linux-6.6 synced 2025-04-24 14:07:52 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

perf gtk: Only support --gtk if compiled in

Browse source 
If HAVE_GTK2_SUPPORT isn't defined then --gtk can't succeed, don't
support it as a command line option in this case.

v2. Is a rebase. Patch appears to have been missed in:
https://lore.kernel.org/lkml/Ygu40djM1MqAfkcF@kernel.org/

Signed-off-by: Ian Rogers <irogers@google.com>
Cc: Stephane Eranian <eranian@google.com>
Cc: xaizek <xaizek@posteo.net>
Link: https://lore.kernel.org/r/20220707203836.345918-1-irogers@google.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Ian Rogers 2022-07-07 13:38:36 -07:00 • committed by Arnaldo Carvalho de Melo
parent 2f1d6b41e2
commit 557cc18ee7
2 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
tools/perf/builtin-annotate.c
View file

@ -50,7 +50,9 @@ struct perf_annotate {
bool use_tui; bool use_tui;
#endif #endif
bool use_stdio, use_stdio2; bool use_stdio, use_stdio2;
#ifdef HAVE_GTK2_SUPPORT
bool use_gtk; bool use_gtk;
#endif
bool skip_missing; bool skip_missing;
bool has_br_stack; bool has_br_stack;
bool group_set; bool group_set;
@ -526,7 +528,9 @@ int cmd_annotate(int argc, const char **argv)
OPT_BOOLEAN('q', "quiet", &quiet, "do now show any message"), OPT_BOOLEAN('q', "quiet", &quiet, "do now show any message"),
OPT_BOOLEAN('D', "dump-raw-trace", &dump_trace, OPT_BOOLEAN('D', "dump-raw-trace", &dump_trace,
"dump raw trace in ASCII"), "dump raw trace in ASCII"),
#ifdef HAVE_GTK2_SUPPORT
OPT_BOOLEAN(0, "gtk", &annotate.use_gtk, "Use the GTK interface"), OPT_BOOLEAN(0, "gtk", &annotate.use_gtk, "Use the GTK interface"),
#endif
#ifdef HAVE_SLANG_SUPPORT #ifdef HAVE_SLANG_SUPPORT
OPT_BOOLEAN(0, "tui", &annotate.use_tui, "Use the TUI interface"), OPT_BOOLEAN(0, "tui", &annotate.use_tui, "Use the TUI interface"),
#endif #endif
@ -614,10 +618,12 @@ int cmd_annotate(int argc, const char **argv)
if (annotate_check_args(&annotate.opts) < 0) if (annotate_check_args(&annotate.opts) < 0)
return -EINVAL; return -EINVAL;
#ifdef HAVE_GTK2_SUPPORT
if (symbol_conf.show_nr_samples && annotate.use_gtk) { if (symbol_conf.show_nr_samples && annotate.use_gtk) {
pr_err("--show-nr-samples is not available in --gtk mode at this time\n"); pr_err("--show-nr-samples is not available in --gtk mode at this time\n");
return ret; return ret;
} }
#endif
ret = symbol__validate_sym_arguments(); ret = symbol__validate_sym_arguments();
if (ret) if (ret)
@ -656,8 +662,10 @@ int cmd_annotate(int argc, const char **argv)
else if (annotate.use_tui) else if (annotate.use_tui)
use_browser = 1; use_browser = 1;
#endif #endif
#ifdef HAVE_GTK2_SUPPORT
else if (annotate.use_gtk) else if (annotate.use_gtk)
use_browser = 2; use_browser = 2;
#endif
setup_browser(true); setup_browser(true);

6
tools/perf/builtin-report.c
View file

@ -74,7 +74,9 @@ struct report {
#ifdef HAVE_SLANG_SUPPORT #ifdef HAVE_SLANG_SUPPORT
bool use_tui; bool use_tui;
#endif #endif
#ifdef HAVE_GTK2_SUPPORT
bool use_gtk; bool use_gtk;
#endif
bool use_stdio; bool use_stdio;
bool show_full_info; bool show_full_info;
bool show_threads; bool show_threads;
@ -1227,7 +1229,9 @@ int cmd_report(int argc, const char **argv)
#ifdef HAVE_SLANG_SUPPORT #ifdef HAVE_SLANG_SUPPORT
OPT_BOOLEAN(0, "tui", &report.use_tui, "Use the TUI interface"), OPT_BOOLEAN(0, "tui", &report.use_tui, "Use the TUI interface"),
#endif #endif
#ifdef HAVE_GTK2_SUPPORT
OPT_BOOLEAN(0, "gtk", &report.use_gtk, "Use the GTK2 interface"), OPT_BOOLEAN(0, "gtk", &report.use_gtk, "Use the GTK2 interface"),
#endif
OPT_BOOLEAN(0, "stdio", &report.use_stdio, OPT_BOOLEAN(0, "stdio", &report.use_stdio,
"Use the stdio interface"), "Use the stdio interface"),
OPT_BOOLEAN(0, "header", &report.header, "Show data header."), OPT_BOOLEAN(0, "header", &report.header, "Show data header."),
@ -1516,8 +1520,10 @@ repeat:
else if (report.use_tui) else if (report.use_tui)
use_browser = 1; use_browser = 1;
#endif #endif
#ifdef HAVE_GTK2_SUPPORT
else if (report.use_gtk) else if (report.use_gtk)
use_browser = 2; use_browser = 2;
#endif
/* Force tty output for header output and per-thread stat. */ /* Force tty output for header output and per-thread stat. */
if (report.header || report.header_only || report.show_threads) if (report.header || report.header_only || report.show_threads)