From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Ingo Molnar <mingo@kernel.org>, Thomas Gleixner <tglx@linutronix.de>
Cc: Jiri Olsa <jolsa@kernel.org>, Namhyung Kim <namhyung@kernel.org>,
Clark Williams <williams@redhat.com>,
linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org,
Ravi Bangoria <ravi.bangoria@linux.ibm.com>,
Arnaldo Carvalho de Melo <acme@redhat.com>,
Adrian Hunter <adrian.hunter@intel.com>,
Alexey Budankov <alexey.budankov@linux.intel.com>,
Changbin Du <changbin.du@intel.com>,
Ian Rogers <irogers@google.com>,
Jin Yao <yao.jin@linux.intel.com>, Leo Yan <leo.yan@linaro.org>,
Song Liu <songliubraving@fb.com>,
Taeung Song <treeze.taeung@gmail.com>,
Thomas Richter <tmricht@linux.ibm.com>,
Yisheng Xie <xieyisheng1@huawei.com>
Subject: [PATCH 05/15] perf annotate: Fix --show-nr-samples for tui/stdio2
Date: Fri, 28 Feb 2020 11:00:04 -0300 [thread overview]
Message-ID: <20200228140014.1236-6-acme@kernel.org> (raw)
In-Reply-To: <20200228140014.1236-1-acme@kernel.org>
From: Ravi Bangoria <ravi.bangoria@linux.ibm.com>
perf annotate --show-nr-samples does not really show number of samples.
The reason is we have two separate variables for the same purpose.
One is in symbol_conf.show_nr_samples and another is
annotation_options.show_nr_samples.
We save command line option in symbol_conf.show_nr_samples but uses
annotation_option.show_nr_samples while rendering tui/stdio2 browser.
Though, we copy symbol_conf.show_nr_samples to
annotation__default_options.show_nr_samples but that is not really
effective as we don't use annotation__default_options once we copy
default options to dynamic variable annotate.opts in cmd_annotate().
Instead of all these complication, keep only one variable and use it all
over. symbol_conf.show_nr_samples is used by perf report/top as well. So
let's kill annotation_options.show_nr_samples.
On a side note, I've kept annotation_options.show_nr_samples definition
because it's still used by perf-config code. Follow up patch to fix
perf-config for annotate will remove annotation_options.show_nr_samples.
Signed-off-by: Ravi Bangoria <ravi.bangoria@linux.ibm.com>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexey Budankov <alexey.budankov@linux.intel.com>
Cc: Changbin Du <changbin.du@intel.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Jin Yao <yao.jin@linux.intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Leo Yan <leo.yan@linaro.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Song Liu <songliubraving@fb.com>
Cc: Taeung Song <treeze.taeung@gmail.com>
Cc: Thomas Richter <tmricht@linux.ibm.com>
Cc: Yisheng Xie <xieyisheng1@huawei.com>
Link: http://lore.kernel.org/lkml/20200213064306.160480-4-ravi.bangoria@linux.ibm.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/ui/browsers/annotate.c | 6 +++---
tools/perf/util/annotate.c | 6 ++----
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/tools/perf/ui/browsers/annotate.c b/tools/perf/ui/browsers/annotate.c
index 7e5b44becb5c..9023267e5643 100644
--- a/tools/perf/ui/browsers/annotate.c
+++ b/tools/perf/ui/browsers/annotate.c
@@ -835,9 +835,9 @@ static int annotate_browser__run(struct annotate_browser *browser,
case 't':
if (symbol_conf.show_total_period) {
symbol_conf.show_total_period = false;
- notes->options->show_nr_samples = true;
- } else if (notes->options->show_nr_samples)
- notes->options->show_nr_samples = false;
+ symbol_conf.show_nr_samples = true;
+ } else if (symbol_conf.show_nr_samples)
+ symbol_conf.show_nr_samples = false;
else
symbol_conf.show_total_period = true;
annotation__update_column_widths(notes);
diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
index fe4b44d4ffab..f0741daf94ef 100644
--- a/tools/perf/util/annotate.c
+++ b/tools/perf/util/annotate.c
@@ -2917,7 +2917,7 @@ static void __annotation_line__write(struct annotation_line *al, struct annotati
obj__set_percent_color(obj, percent, current_entry);
if (symbol_conf.show_total_period) {
obj__printf(obj, "%11" PRIu64 " ", al->data[i].he.period);
- } else if (notes->options->show_nr_samples) {
+ } else if (symbol_conf.show_nr_samples) {
obj__printf(obj, "%6" PRIu64 " ",
al->data[i].he.nr_samples);
} else {
@@ -2932,7 +2932,7 @@ static void __annotation_line__write(struct annotation_line *al, struct annotati
else {
obj__printf(obj, "%-*s", pcnt_width,
symbol_conf.show_total_period ? "Period" :
- notes->options->show_nr_samples ? "Samples" : "Percent");
+ symbol_conf.show_nr_samples ? "Samples" : "Percent");
}
}
@@ -3154,8 +3154,6 @@ static int annotation__config(const char *var, const char *value,
void annotation_config__init(void)
{
perf_config(annotation__config, NULL);
-
- annotation__default_options.show_nr_samples = symbol_conf.show_nr_samples;
}
static unsigned int parse_percent_type(char *str1, char *str2)
--
2.21.1
next prev parent reply other threads:[~2020-02-28 14:00 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-28 13:59 [GIT PULL] perf/urgent fixes Arnaldo Carvalho de Melo
2020-02-28 14:00 ` [PATCH 01/15] tools arch x86: Sync the msr-index.h copy with the kernel sources Arnaldo Carvalho de Melo
2020-02-28 14:00 ` [PATCH 02/15] tools headers UAPI: Update tools's copy of kvm.h headers Arnaldo Carvalho de Melo
2020-02-28 14:00 ` [PATCH 03/15] perf annotate/tui: Re-render title bar after switching back from script browser Arnaldo Carvalho de Melo
2020-02-28 14:00 ` [PATCH 04/15] perf annotate: Fix --show-total-period for tui/stdio2 Arnaldo Carvalho de Melo
2020-02-28 14:00 ` Arnaldo Carvalho de Melo [this message]
2020-02-28 14:00 ` [PATCH 06/15] perf config: Introduce perf_config_u8() Arnaldo Carvalho de Melo
2020-02-28 14:00 ` [PATCH 07/15] perf annotate: Make perf config effective Arnaldo Carvalho de Melo
2020-02-28 14:00 ` [PATCH 08/15] perf annotate: Prefer cmdline option over default config Arnaldo Carvalho de Melo
2020-02-28 14:00 ` [PATCH 09/15] perf annotate: Fix perf config option description Arnaldo Carvalho de Melo
2020-02-28 14:00 ` [PATCH 10/15] perf config: Document missing config options Arnaldo Carvalho de Melo
2020-02-28 14:00 ` [PATCH 11/15] perf probe: Check return value of strlist__add() for -ENOMEM Arnaldo Carvalho de Melo
2020-02-28 14:00 ` [PATCH 12/15] perf annotate: Remove privsize from symbol__annotate() args Arnaldo Carvalho de Melo
2020-02-28 14:00 ` [PATCH 13/15] perf annotate: Simplify disasm_line allocation and freeing code Arnaldo Carvalho de Melo
2020-02-28 14:00 ` [PATCH 14/15] perf annotate: Align struct annotate_args Arnaldo Carvalho de Melo
2020-02-28 14:00 ` [PATCH 15/15] perf annotate: Fix segfault with source toggle Arnaldo Carvalho de Melo
2020-02-29 9:11 ` [GIT PULL] perf/urgent fixes Ingo Molnar
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=20200228140014.1236-6-acme@kernel.org \
--to=acme@kernel.org \
--cc=acme@redhat.com \
--cc=adrian.hunter@intel.com \
--cc=alexey.budankov@linux.intel.com \
--cc=changbin.du@intel.com \
--cc=irogers@google.com \
--cc=jolsa@kernel.org \
--cc=leo.yan@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
--cc=ravi.bangoria@linux.ibm.com \
--cc=songliubraving@fb.com \
--cc=tglx@linutronix.de \
--cc=tmricht@linux.ibm.com \
--cc=treeze.taeung@gmail.com \
--cc=williams@redhat.com \
--cc=xieyisheng1@huawei.com \
--cc=yao.jin@linux.intel.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).