iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

perf annotate: Fix --show-nr-samples for tui/stdio2

Browse Source 
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>
This commit is contained in:
Ravi Bangoria 2020-02-13 12:13:01 +05:30 committed by Arnaldo Carvalho de Melo
parent 68aac855b6
commit 46ccb44269
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/perf/ui/browsers/annotate.c
View File

@ -835,9 +835,9 @@ show_sup_ins:
case 't': case 't':
if (symbol_conf.show_total_period) { if (symbol_conf.show_total_period) {
symbol_conf.show_total_period = false; symbol_conf.show_total_period = false;
notes->options->show_nr_samples = true; symbol_conf.show_nr_samples = true;
} else if (notes->options->show_nr_samples) } else if (symbol_conf.show_nr_samples)
notes->options->show_nr_samples = false; symbol_conf.show_nr_samples = false;
else else
symbol_conf.show_total_period = true; symbol_conf.show_total_period = true;
annotation__update_column_widths(notes); annotation__update_column_widths(notes);

6
tools/perf/util/annotate.c
View File

@ -2917,7 +2917,7 @@ static void __annotation_line__write(struct annotation_line *al, struct annotati
obj__set_percent_color(obj, percent, current_entry); obj__set_percent_color(obj, percent, current_entry);
if (symbol_conf.show_total_period) { if (symbol_conf.show_total_period) {
obj__printf(obj, "%11" PRIu64 " ", al->data[i].he.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 " ", obj__printf(obj, "%6" PRIu64 " ",
al->data[i].he.nr_samples); al->data[i].he.nr_samples);
} else { } else {
@ -2932,7 +2932,7 @@ static void __annotation_line__write(struct annotation_line *al, struct annotati
else { else {
obj__printf(obj, "%-*s", pcnt_width, obj__printf(obj, "%-*s", pcnt_width,
symbol_conf.show_total_period ? "Period" : 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) void annotation_config__init(void)
{ {
perf_config(annotation__config, NULL); 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) static unsigned int parse_percent_type(char *str1, char *str2)