Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1714708 > unrolled thread

[PATCH v3 4/5] perf annotate browser: Support --show-nr-samples option

Started byTaeung Song <treeze.taeung@gmail.com>
First post2017-08-18 10:50 +0200
Last post2017-08-22 12:30 +0200
Articles 4 — 3 participants

Back to article view | Back to linux.kernel


Contents

  [PATCH v3 4/5] perf annotate browser: Support --show-nr-samples option Taeung Song <treeze.taeung@gmail.com> - 2017-08-18 10:50 +0200
    Re: [PATCH v3 4/5] perf annotate browser: Support --show-nr-samples  option Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-08-18 16:20 +0200
      Re: [PATCH v3 4/5] perf annotate browser: Support --show-nr-samples  option Taeung Song <treeze.taeung@gmail.com> - 2017-08-21 07:40 +0200
    [tip:perf/core] perf annotate browser: Support --show-nr-samples  option tip-bot for Taeung Song <tipbot@zytor.com> - 2017-08-22 12:30 +0200

#1714708 — [PATCH v3 4/5] perf annotate browser: Support --show-nr-samples option

FromTaeung Song <treeze.taeung@gmail.com>
Date2017-08-18 10:50 +0200
Subject[PATCH v3 4/5] perf annotate browser: Support --show-nr-samples option
Message-ID<ufL8C-13v-15@gated-at.bofh.it>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Signed-off-by: Taeung Song <treeze.taeung@gmail.com>
---
 tools/perf/ui/browsers/annotate.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/tools/perf/ui/browsers/annotate.c b/tools/perf/ui/browsers/annotate.c
index 80f38da..faca1b9 100644
--- a/tools/perf/ui/browsers/annotate.c
+++ b/tools/perf/ui/browsers/annotate.c
@@ -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;
+		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),
 };
-- 
2.7.4

[toc] | [next] | [standalone]


#1715162 — Re: [PATCH v3 4/5] perf annotate browser: Support --show-nr-samples option

FromArnaldo Carvalho de Melo <acme@kernel.org>
Date2017-08-18 16:20 +0200
SubjectRe: [PATCH v3 4/5] perf annotate browser: Support --show-nr-samples option
Message-ID<ufQhZ-4UA-73@gated-at.bofh.it>
In reply to#1714708
Em Fri, Aug 18, 2017 at 05:47:03PM +0900, Taeung Song escreveu:
> Cc: Namhyung Kim <namhyung@kernel.org>
> Cc: Jiri Olsa <jolsa@redhat.com>
> Signed-off-by: Taeung Song <treeze.taeung@gmail.com>

Ok, now that check for !--stdio is lifted and replaced with:

-       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;
        }

- Arnaldo

[toc] | [prev] | [next] | [standalone]


#1716094 — Re: [PATCH v3 4/5] perf annotate browser: Support --show-nr-samples option

FromTaeung Song <treeze.taeung@gmail.com>
Date2017-08-21 07:40 +0200
SubjectRe: [PATCH v3 4/5] perf annotate browser: Support --show-nr-samples option
Message-ID<ugNBn-by-5@gated-at.bofh.it>
In reply to#1715162

On 08/18/2017 11:17 PM, Arnaldo Carvalho de Melo wrote:
> Em Fri, Aug 18, 2017 at 05:47:03PM +0900, Taeung Song escreveu:
>> Cc: Namhyung Kim <namhyung@kernel.org>
>> Cc: Jiri Olsa <jolsa@redhat.com>
>> Signed-off-by: Taeung Song <treeze.taeung@gmail.com>
> 
> Ok, now that check for !--stdio is lifted and replaced with:
> 
> -       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;
>          }
> 
> - Arnaldo
> 

I got it :)

Thanks,
Taeung

[toc] | [prev] | [next] | [standalone]


#1717277 — [tip:perf/core] perf annotate browser: Support --show-nr-samples option

Fromtip-bot for Taeung Song <tipbot@zytor.com>
Date2017-08-22 12:30 +0200
Subject[tip:perf/core] perf annotate browser: Support --show-nr-samples option
Message-ID<uheBA-10X-29@gated-at.bofh.it>
In reply to#1714708
Commit-ID:  9cef4b0b5b7f64016f043609313aaa821d682d2e
Gitweb:     http://git.kernel.org/tip/9cef4b0b5b7f64016f043609313aaa821d682d2e
Author:     Taeung Song <treeze.taeung@gmail.com>
AuthorDate: Fri, 18 Aug 2017 17:47:03 +0900
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Fri, 18 Aug 2017 11:15:09 -0300

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: Taeung Song <treeze.taeung@gmail.com>
Tested-by: Arnaldo 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: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/builtin-annotate.c     |  4 ++--
 tools/perf/ui/browsers/annotate.c | 14 +++++++++++---
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c
index 89fc038..c383731 100644
--- a/tools/perf/builtin-annotate.c
+++ b/tools/perf/builtin-annotate.c
@@ -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;
 	}
 
diff --git a/tools/perf/ui/browsers/annotate.c b/tools/perf/ui/browsers/annotate.c
index 80f38da..faca1b9 100644
--- a/tools/perf/ui/browsers/annotate.c
+++ b/tools/perf/ui/browsers/annotate.c
@@ -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 @@ out:
 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;
+		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),
 };

[toc] | [prev] | [standalone]


Back to top | Article view | linux.kernel


csiph-web