perf annotate: Fix --show-total-period for tui/stdio2 (68aac855) · Commits · 戴 / test

perf annotate --show-total-period does not really show total period. The reason is we have two separate variables for the same purpose. One is in symbol_conf.show_total_period and another is annotation_options.show_total_period. We save command line option in symbol_conf.show_total_period but uses annotation_option.show_total_period while rendering tui/stdio2 browser. Though, we copy symbol_conf.show_total_period to annotation__default_options.show_total_period 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_total_period is used by perf report/top as well. So let's kill annotation_options.show_total_period. On a side note, I've kept annotation_options.show_total_period definition because it's still used by perf-config code. Follow up patch to fix perf-config for annotate will remove annotation_options.show_total_period. 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-3-ravi.bangoria@linux.ibm.com Signed-off-by:

Arnaldo Carvalho de Melo <acme@redhat.com>

tools/perf/ui/browsers/annotate.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -833,13 +833,13 @@ show_sup_ins:
		map_symbol__annotation_dump(ms, evsel, browser->opts);
		continue;
		case 't':
		if (notes->options->show_total_period) {
		notes->options->show_total_period = false;
		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;
		else
		notes->options->show_total_period = true;
		symbol_conf.show_total_period = true;
		annotation__update_column_widths(notes);
		continue;
		case 'c':

tools/perf/util/annotate.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -2915,7 +2915,7 @@ static void __annotation_line__write(struct annotation_line *al, struct annotati
		percent = annotation_data__percent(&al->data[i], percent_type);

		obj__set_percent_color(obj, percent, current_entry);
		if (notes->options->show_total_period) {
		if (symbol_conf.show_total_period) {
		obj__printf(obj, "%11" PRIu64 " ", al->data[i].he.period);
		} else if (notes->options->show_nr_samples) {
		obj__printf(obj, "%6" PRIu64 " ",
		@@ -2931,7 +2931,7 @@ static void __annotation_line__write(struct annotation_line *al, struct annotati
		obj__printf(obj, "%-*s", pcnt_width, " ");
		else {
		obj__printf(obj, "%-*s", pcnt_width,
		notes->options->show_total_period ? "Period" :
		symbol_conf.show_total_period ? "Period" :
		notes->options->show_nr_samples ? "Samples" : "Percent");
		}
		}
		@@ -3155,7 +3155,6 @@ void annotation_config__init(void)
		{
		perf_config(annotation__config, NULL);

		annotation__default_options.show_total_period = symbol_conf.show_total_period;
		annotation__default_options.show_nr_samples = symbol_conf.show_nr_samples;
		}

tools/perf/util/annotate.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -309,7 +309,7 @@ static inline int annotation__cycles_width(struct annotation *notes)

		static inline int annotation__pcnt_width(struct annotation *notes)
		{
		return (notes->options->show_total_period ? 12 : 7) * notes->nr_events;
		return (symbol_conf.show_total_period ? 12 : 7) * notes->nr_events;
		}

		static inline bool annotation_line__filter(struct annotation_line al, struct annotation notes)

Admin message