[PATCH v3 5/5] perf annotate browser: Circulate percent, total period and samples view

[PATCH v3 5/5] perf annotate browser: Circulate percent, total period and samples view

[Taeung Song]

With a existing 't' hotkey, support the three view based on percent,
total period and number of samples on the annotate TUI browser,
circulating them like below:

  Percent -> Period -> Samples -> Percent ...

Suggested-by: Namhyung Kim <namhyung@kernel.org>
Cc: Milian Wolff <milian.wolff@kdab.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Signed-off-by: Taeung Song <treeze.taeung@gmail.com>
---
 tools/perf/ui/browsers/annotate.c | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/tools/perf/ui/browsers/annotate.c b/tools/perf/ui/browsers/annotate.c
index faca1b9..e82e6c5 100644
--- a/tools/perf/ui/browsers/annotate.c
+++ b/tools/perf/ui/browsers/annotate.c
@@ -835,7 +835,7 @@ static int annotate_browser__run(struct annotate_browser *browser,
 		"n             Search next string\n"
 		"o             Toggle disassembler output/simplified view\n"
 		"s             Toggle source code view\n"
-		"t             Toggle total period view\n"
+		"t             Circulate percent, total period, samples view\n"
 		"/             Search string\n"
 		"k             Toggle line numbers\n"
 		"r             Run available scripts\n"
@@ -912,8 +912,19 @@ static int annotate_browser__run(struct annotate_browser *browser,
 			}
 			continue;
 		case 't':
-			annotate_browser__opts.show_total_period =
-			  !annotate_browser__opts.show_total_period;
+			if (annotate_browser__opts.show_total_period) {
+				annotate_browser__opts.show_total_period = false;
+				annotate_browser__opts.show_nr_samples = true;
+			} else if (annotate_browser__opts.show_nr_samples)
+				annotate_browser__opts.show_nr_samples = false;
+			else
+				annotate_browser__opts.show_total_period = true;
+			annotate_browser__update_addr_width(browser);
+			continue;
+		case 'e':
+			annotate_browser__opts.show_total_period = false;
+			annotate_browser__opts.show_nr_samples =
+				!annotate_browser__opts.show_nr_samples;
 			annotate_browser__update_addr_width(browser);
 			continue;
 		case K_LEFT:
-- 
2.7.4

Re: [PATCH v3 5/5] perf annotate browser: Circulate percent, total period and samples view

[Arnaldo Carvalho de Melo]

Em Fri, Aug 18, 2017 at 05:47:08PM +0900, Taeung Song escreveu:
> With a existing 't' hotkey, support the three view based on percent,
> total period and number of samples on the annotate TUI browser,
> circulating them like below:
> 
>   Percent -> Period -> Samples -> Percent ...
> 
> Suggested-by: Namhyung Kim <namhyung@kernel.org>
> Cc: Milian Wolff <milian.wolff@kdab.com>
> Cc: Jiri Olsa <jolsa@redhat.com>
> Signed-off-by: Taeung Song <treeze.taeung@gmail.com>
> ---

Ok, here I removed this part, that is not documented in the patch nor in
the 'h' help screen, if you think it should be considered, please
resubmit it with a proper explanation:

diff --git a/tools/perf/ui/browsers/annotate.c b/tools/perf/ui/browsers/annotate.c
index e82e6c5df83b..ba0aee576a2b 100644
--- a/tools/perf/ui/browsers/annotate.c
+++ b/tools/perf/ui/browsers/annotate.c
@@ -921,12 +921,6 @@ static int annotate_browser__run(struct annotate_browser *browser,
 				annotate_browser__opts.show_total_period = true;
 			annotate_browser__update_addr_width(browser);
 			continue;
-		case 'e':
-			annotate_browser__opts.show_total_period = false;
-			annotate_browser__opts.show_nr_samples =
-				!annotate_browser__opts.show_nr_samples;
-			annotate_browser__update_addr_width(browser);
-			continue;
 		case K_LEFT:
 		case K_ESC:
 		case 'q':

Re: [PATCH v3 5/5] perf annotate browser: Circulate percent, total period and samples view

[Taeung Song]

On 08/18/2017 11:23 PM, Arnaldo Carvalho de Melo wrote:
> Em Fri, Aug 18, 2017 at 05:47:08PM +0900, Taeung Song escreveu:
>> With a existing 't' hotkey, support the three view based on percent,
>> total period and number of samples on the annotate TUI browser,
>> circulating them like below:
>>
>>    Percent -> Period -> Samples -> Percent ...
>>
>> Suggested-by: Namhyung Kim <namhyung@kernel.org>
>> Cc: Milian Wolff <milian.wolff@kdab.com>
>> Cc: Jiri Olsa <jolsa@redhat.com>
>> Signed-off-by: Taeung Song <treeze.taeung@gmail.com>
>> ---
> 
> Ok, here I removed this part, that is not documented in the patch nor in
> the 'h' help screen, if you think it should be considered, please
> resubmit it with a proper explanation:

I'm really sorry. The case 'e' code is a residue..
I missed removing the code.
Thank you for indicating my mistakes.

Do I resend this patchkit based on your changes ?
Or, will you modify it by yourself ?

Thanks,
Taeung

> 
> diff --git a/tools/perf/ui/browsers/annotate.c b/tools/perf/ui/browsers/annotate.c
> index e82e6c5df83b..ba0aee576a2b 100644
> --- a/tools/perf/ui/browsers/annotate.c
> +++ b/tools/perf/ui/browsers/annotate.c
> @@ -921,12 +921,6 @@ static int annotate_browser__run(struct annotate_browser *browser,
>   				annotate_browser__opts.show_total_period = true;
>   			annotate_browser__update_addr_width(browser);
>   			continue;
> -		case 'e':
> -			annotate_browser__opts.show_total_period = false;
> -			annotate_browser__opts.show_nr_samples =
> -				!annotate_browser__opts.show_nr_samples;
> -			annotate_browser__update_addr_width(browser);
> -			continue;
>   		case K_LEFT:
>   		case K_ESC:
>   		case 'q':
> 

Re: [PATCH v3 5/5] perf annotate browser: Circulate percent, total period and samples view

[Arnaldo Carvalho de Melo]

Em Mon, Aug 21, 2017 at 02:47:09PM +0900, Taeung Song escreveu:
> 
> 
> On 08/18/2017 11:23 PM, Arnaldo Carvalho de Melo wrote:
> > Em Fri, Aug 18, 2017 at 05:47:08PM +0900, Taeung Song escreveu:
> > > With a existing 't' hotkey, support the three view based on percent,
> > > total period and number of samples on the annotate TUI browser,
> > > circulating them like below:
> > > 
> > >    Percent -> Period -> Samples -> Percent ...
> > > 
> > > Suggested-by: Namhyung Kim <namhyung@kernel.org>
> > > Cc: Milian Wolff <milian.wolff@kdab.com>
> > > Cc: Jiri Olsa <jolsa@redhat.com>
> > > Signed-off-by: Taeung Song <treeze.taeung@gmail.com>
> > > ---
> > 
> > Ok, here I removed this part, that is not documented in the patch nor in
> > the 'h' help screen, if you think it should be considered, please
> > resubmit it with a proper explanation:
> 
> I'm really sorry. The case 'e' code is a residue..
> I missed removing the code.
> Thank you for indicating my mistakes.
> 
> Do I resend this patchkit based on your changes ?
> Or, will you modify it by yourself ?

I fixed it myself, sending to Ingo now.

Thanks!

- Arnaldo

[tip:perf/core] perf annotate browser: Circulate percent, total-period and nr-samples view

[tip-bot for Taeung Song]

Commit-ID:  3a555c7799de69d73826eccc9a21948a5775d4d3
Gitweb:     http://git.kernel.org/tip/3a555c7799de69d73826eccc9a21948a5775d4d3
Author:     Taeung Song <treeze.taeung@gmail.com>
AuthorDate: Fri, 18 Aug 2017 17:47:08 +0900
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Fri, 18 Aug 2017 11:23:20 -0300

perf annotate browser: Circulate percent, total-period and nr-samples view

Using the existing 't' hotkey, support the three views: percent, total
period and number of samples on the annotate TUI browser, circulating
them like below:

  Percent -> Total Period -> Nr Samples -> Percent ...

Committer notes:

Removed new 'e' hotkey, should be resubmitted as a separate patch, with
proper justification for its inclusion.

Suggested-by: Namhyung Kim <namhyung@kernel.org>
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: Milian Wolff <milian.wolff@kdab.com>
Link: http://lkml.kernel.org/r/1503046028-5691-1-git-send-email-treeze.taeung@gmail.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/ui/browsers/annotate.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/tools/perf/ui/browsers/annotate.c b/tools/perf/ui/browsers/annotate.c
index faca1b9..ba0aee5 100644
--- a/tools/perf/ui/browsers/annotate.c
+++ b/tools/perf/ui/browsers/annotate.c
@@ -835,7 +835,7 @@ static int annotate_browser__run(struct annotate_browser *browser,
 		"n             Search next string\n"
 		"o             Toggle disassembler output/simplified view\n"
 		"s             Toggle source code view\n"
-		"t             Toggle total period view\n"
+		"t             Circulate percent, total period, samples view\n"
 		"/             Search string\n"
 		"k             Toggle line numbers\n"
 		"r             Run available scripts\n"
@@ -912,8 +912,13 @@ show_sup_ins:
 			}
 			continue;
 		case 't':
-			annotate_browser__opts.show_total_period =
-			  !annotate_browser__opts.show_total_period;
+			if (annotate_browser__opts.show_total_period) {
+				annotate_browser__opts.show_total_period = false;
+				annotate_browser__opts.show_nr_samples = true;
+			} else if (annotate_browser__opts.show_nr_samples)
+				annotate_browser__opts.show_nr_samples = false;
+			else
+				annotate_browser__opts.show_total_period = true;
 			annotate_browser__update_addr_width(browser);
 			continue;
 		case K_LEFT: