Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9cef4b0b authored by Taeung Song's avatar Taeung Song Committed by Arnaldo Carvalho de Melo
Browse files

perf annotate browser: Support --show-nr-samples option 



Support the --show-nr-samples in the TUI browser.

Committer notes:

Lift the restriction about --tui but leave it for --gtk:

  $ export LD_LIBRARY_PATH=~/lib64
  $ perf annotate --gtk --show-nr-samples --show-nr-samples is not available in --gtk mode at this time
  $

Signed-off-by: default avatarTaeung Song <treeze.taeung@gmail.com>
Tested-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: http://lkml.kernel.org/r/1503046023-5646-1-git-send-email-treeze.taeung@gmail.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 01c85629

tools/perf/builtin-annotate.c

+2 −2
Original line number Diff line number Diff line
@@ -474,8 +474,8 @@ int cmd_annotate(int argc, const char **argv) 
		annotate.sym_hist_filter = argv[0];

	}



	if (symbol_conf.show_nr_samples && !annotate.use_stdio) {

		pr_err("--show-nr-samples is only available in --stdio mode at this time\n");

	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;

	}

tools/perf/ui/browsers/annotate.c

+11 −3
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ static struct annotate_browser_opt { 
	     jump_arrows,

	     show_linenr,

	     show_nr_jumps,

	     show_nr_samples,

	     show_total_period;

} annotate_browser__opts = {

	.use_offset	= true,
@@ -155,6 +156,9 @@ static void annotate_browser__write(struct ui_browser *browser, void *entry, int 
			if (annotate_browser__opts.show_total_period) {

				ui_browser__printf(browser, "%11" PRIu64 " ",

						   bdl->samples[i].he.period);

			} else if (annotate_browser__opts.show_nr_samples) {

				ui_browser__printf(browser, "%6" PRIu64 " ",

						   bdl->samples[i].he.nr_samples);

			} else {

				ui_browser__printf(browser, "%6.2f ",

						   bdl->samples[i].percent);
@@ -167,7 +171,8 @@ static void annotate_browser__write(struct ui_browser *browser, void *entry, int 
			ui_browser__write_nstring(browser, " ", pcnt_width);

		else {

			ui_browser__printf(browser, "%*s", pcnt_width,

					   annotate_browser__opts.show_total_period ? "Period" : "Percent");

					   annotate_browser__opts.show_total_period ? "Period" :

					   annotate_browser__opts.show_nr_samples ? "Samples" : "Percent");

		}

	}

	if (ab->have_cycles) {
@@ -931,9 +936,11 @@ static int annotate_browser__run(struct annotate_browser *browser, 
int map_symbol__tui_annotate(struct map_symbol *ms, struct perf_evsel *evsel,

			     struct hist_browser_timer *hbt)

{

	/* Set default value for show_total_period.  */

	/* Set default value for show_total_period and show_nr_samples  */

	annotate_browser__opts.show_total_period =

		symbol_conf.show_total_period;

	annotate_browser__opts.show_nr_samples =

		symbol_conf.show_nr_samples;



	return symbol__tui_annotate(ms->sym, ms->map, evsel, hbt);

}
@@ -1184,6 +1191,7 @@ static struct annotate_config { 
	ANNOTATE_CFG(jump_arrows),

	ANNOTATE_CFG(show_linenr),

	ANNOTATE_CFG(show_nr_jumps),

	ANNOTATE_CFG(show_nr_samples),

	ANNOTATE_CFG(show_total_period),

	ANNOTATE_CFG(use_offset),

};