From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Ian Rogers <irogers@google.com>
Cc: xaizek <xaizek@posteo.net>,
linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org,
Stephane Eranian <eranian@google.com>
Subject: Re: [PATCH v2] perf gtk: Only support --gtk if compiled in
Date: Mon, 18 Jul 2022 12:38:03 -0300 [thread overview]
Message-ID: <YtV+Wxf8l7NgVLTy@kernel.org> (raw)
In-Reply-To: <20220707203836.345918-1-irogers@google.com>
Em Thu, Jul 07, 2022 at 01:38:36PM -0700, Ian Rogers escreveu:
> 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/
Thanks, applied.
- Arnaldo
> Signed-off-by: Ian Rogers <irogers@google.com>
> ---
> tools/perf/builtin-annotate.c | 8 ++++++++
> tools/perf/builtin-report.c | 6 ++++++
> 2 files changed, 14 insertions(+)
>
> diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c
> index 2ffe071dbcff..f839e69492e8 100644
> --- a/tools/perf/builtin-annotate.c
> +++ b/tools/perf/builtin-annotate.c
> @@ -50,7 +50,9 @@ struct perf_annotate {
> bool use_tui;
> #endif
> bool use_stdio, use_stdio2;
> +#ifdef HAVE_GTK2_SUPPORT
> bool use_gtk;
> +#endif
> bool skip_missing;
> bool has_br_stack;
> 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('D', "dump-raw-trace", &dump_trace,
> "dump raw trace in ASCII"),
> +#ifdef HAVE_GTK2_SUPPORT
> OPT_BOOLEAN(0, "gtk", &annotate.use_gtk, "Use the GTK interface"),
> +#endif
> #ifdef HAVE_SLANG_SUPPORT
> OPT_BOOLEAN(0, "tui", &annotate.use_tui, "Use the TUI interface"),
> #endif
> @@ -614,10 +618,12 @@ int cmd_annotate(int argc, const char **argv)
> if (annotate_check_args(&annotate.opts) < 0)
> return -EINVAL;
>
> +#ifdef HAVE_GTK2_SUPPORT
> if (symbol_conf.show_nr_samples && annotate.use_gtk) {
> pr_err("--show-nr-samples is not available in --gtk mode at this time\n");
> return ret;
> }
> +#endif
>
> ret = symbol__validate_sym_arguments();
> if (ret)
> @@ -656,8 +662,10 @@ int cmd_annotate(int argc, const char **argv)
> else if (annotate.use_tui)
> use_browser = 1;
> #endif
> +#ifdef HAVE_GTK2_SUPPORT
> else if (annotate.use_gtk)
> use_browser = 2;
> +#endif
>
> setup_browser(true);
>
> diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
> index afe4a5539ecc..91ed41cc7d88 100644
> --- a/tools/perf/builtin-report.c
> +++ b/tools/perf/builtin-report.c
> @@ -74,7 +74,9 @@ struct report {
> #ifdef HAVE_SLANG_SUPPORT
> bool use_tui;
> #endif
> +#ifdef HAVE_GTK2_SUPPORT
> bool use_gtk;
> +#endif
> bool use_stdio;
> bool show_full_info;
> bool show_threads;
> @@ -1227,7 +1229,9 @@ int cmd_report(int argc, const char **argv)
> #ifdef HAVE_SLANG_SUPPORT
> OPT_BOOLEAN(0, "tui", &report.use_tui, "Use the TUI interface"),
> #endif
> +#ifdef HAVE_GTK2_SUPPORT
> OPT_BOOLEAN(0, "gtk", &report.use_gtk, "Use the GTK2 interface"),
> +#endif
> OPT_BOOLEAN(0, "stdio", &report.use_stdio,
> "Use the stdio interface"),
> OPT_BOOLEAN(0, "header", &report.header, "Show data header."),
> @@ -1516,8 +1520,10 @@ int cmd_report(int argc, const char **argv)
> else if (report.use_tui)
> use_browser = 1;
> #endif
> +#ifdef HAVE_GTK2_SUPPORT
> else if (report.use_gtk)
> use_browser = 2;
> +#endif
>
> /* Force tty output for header output and per-thread stat. */
> if (report.header || report.header_only || report.show_threads)
> --
> 2.37.0.rc0.161.g10f37bed90-goog
--
- Arnaldo
prev parent reply other threads:[~2022-07-18 15:38 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-07 20:38 [PATCH v2] perf gtk: Only support --gtk if compiled in Ian Rogers
2022-07-18 15:38 ` Arnaldo Carvalho de Melo [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YtV+Wxf8l7NgVLTy@kernel.org \
--to=acme@kernel.org \
--cc=eranian@google.com \
--cc=irogers@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=xaizek@posteo.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.