linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 0/5] perf annotate: Random tiny cleanups
@ 2012-02-23  8:46 Namhyung Kim
  2012-02-23  8:46 ` [PATCH 1/5] perf annotate: Print asm code as blue when source code is displayed Namhyung Kim
                   ` (5 more replies)
  0 siblings, 6 replies; 12+ messages in thread
From: Namhyung Kim @ 2012-02-23  8:46 UTC (permalink / raw)
  To: Arnaldo Carvalho de Melo
  Cc: Peter Zijlstra, Paul Mackerras, Ingo Molnar, Namhyung Kim, LKML

Hello,

This is a patchset tries to fix and improve what I found during code reading.
Please take a look and consider applying. Comments are welcome, of course.

Thanks.


Namhyung Kim (5):
  perf annotate: Print asm code as blue when source code is displayed
  perf annotate: Handle lower case key code in annotate_browser__run()
  perf annotate: Restore title when came back to original symbol
  perf annotate: Fix help string on tui
  perf annotate: Add missing newline on error message

 tools/perf/util/annotate.c             |    2 +-
 tools/perf/util/ui/browsers/annotate.c |   18 ++++++++++++------
 2 files changed, 13 insertions(+), 7 deletions(-)

-- 
1.7.9


^ permalink raw reply	[flat|nested] 12+ messages in thread
* [PATCH 1/5] perf annotate: Print asm code as blue when source code is displayed
  2012-02-23  8:46 [PATCH 0/5] perf annotate: Random tiny cleanups Namhyung Kim
@ 2012-02-23  8:46 ` Namhyung Kim
  2012-03-05 16:20   ` [tip:perf/core] " tip-bot for Namhyung Kim
  2012-02-23  8:46 ` [PATCH 2/5] perf annotate: Handle lower case key code in annotate_browser__run() Namhyung Kim
                   ` (4 subsequent siblings)
  5 siblings, 1 reply; 12+ messages in thread
From: Namhyung Kim @ 2012-02-23  8:46 UTC (permalink / raw)
  To: Arnaldo Carvalho de Melo
  Cc: Peter Zijlstra, Paul Mackerras, Ingo Molnar, Namhyung Kim, LKML

Print unselected asm code lines as blue. This is what we do now
for --stdio.

Signed-off-by: Namhyung Kim <namhyung.kim@lge.com>
---
 tools/perf/util/ui/browsers/annotate.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/tools/perf/util/ui/browsers/annotate.c b/tools/perf/util/ui/browsers/annotate.c
index 295a9c93f945..76caae95df39 100644
--- a/tools/perf/util/ui/browsers/annotate.c
+++ b/tools/perf/util/ui/browsers/annotate.c
@@ -69,14 +69,17 @@ static void annotate_browser__write(struct ui_browser *self, void *entry, int ro
 	if (!self->navkeypressed)
 		width += 1;
 
+	if (!ab->hide_src_code && ol->offset != -1)
+		if (!current_entry || (self->use_navkeypressed &&
+				       !self->navkeypressed))
+			ui_browser__set_color(self, HE_COLORSET_CODE);
+
 	if (!*ol->line)
 		slsmg_write_nstring(" ", width - 18);
 	else
 		slsmg_write_nstring(ol->line, width - 18);
 
-	if (!current_entry)
-		ui_browser__set_color(self, HE_COLORSET_CODE);
-	else
+	if (current_entry)
 		ab->selection = ol;
 }
 
-- 
1.7.9


^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [PATCH 2/5] perf annotate: Handle lower case key code in annotate_browser__run()
  2012-02-23  8:46 [PATCH 0/5] perf annotate: Random tiny cleanups Namhyung Kim
  2012-02-23  8:46 ` [PATCH 1/5] perf annotate: Print asm code as blue when source code is displayed Namhyung Kim
@ 2012-02-23  8:46 ` Namhyung Kim
  2012-03-05 16:21   ` [tip:perf/core] " tip-bot for Namhyung Kim
  2012-02-23  8:46 ` [PATCH 3/5] perf annotate: Restore title when came back to original symbol Namhyung Kim
                   ` (3 subsequent siblings)
  5 siblings, 1 reply; 12+ messages in thread
From: Namhyung Kim @ 2012-02-23  8:46 UTC (permalink / raw)
  To: Arnaldo Carvalho de Melo
  Cc: Peter Zijlstra, Paul Mackerras, Ingo Molnar, Namhyung Kim, LKML

Accepting upper case character only is unconvenient since it requires
SHIFT key too. Why not change to it accept a simple key stroke?

Signed-off-by: Namhyung Kim <namhyung.kim@lge.com>
---
 tools/perf/util/ui/browsers/annotate.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/tools/perf/util/ui/browsers/annotate.c b/tools/perf/util/ui/browsers/annotate.c
index 76caae95df39..374d3bc570b2 100644
--- a/tools/perf/util/ui/browsers/annotate.c
+++ b/tools/perf/util/ui/browsers/annotate.c
@@ -287,9 +287,11 @@ static int annotate_browser__run(struct annotate_browser *self, int evidx,
 				nd = self->curr_hot;
 			break;
 		case 'H':
+		case 'h':
 			nd = self->curr_hot;
 			break;
 		case 'S':
+		case 's':
 			if (annotate_browser__toggle_source(self))
 				ui_helpline__puts(help);
 			continue;
-- 
1.7.9


^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [PATCH 3/5] perf annotate: Restore title when came back to original symbol
  2012-02-23  8:46 [PATCH 0/5] perf annotate: Random tiny cleanups Namhyung Kim
  2012-02-23  8:46 ` [PATCH 1/5] perf annotate: Print asm code as blue when source code is displayed Namhyung Kim
  2012-02-23  8:46 ` [PATCH 2/5] perf annotate: Handle lower case key code in annotate_browser__run() Namhyung Kim
@ 2012-02-23  8:46 ` Namhyung Kim
  2012-03-05 16:22   ` [tip:perf/core] " tip-bot for Namhyung Kim
  2012-02-23  8:46 ` [PATCH 4/5] perf annotate: Fix help string on tui Namhyung Kim
                   ` (2 subsequent siblings)
  5 siblings, 1 reply; 12+ messages in thread
From: Namhyung Kim @ 2012-02-23  8:46 UTC (permalink / raw)
  To: Arnaldo Carvalho de Melo
  Cc: Peter Zijlstra, Paul Mackerras, Ingo Molnar, Namhyung Kim, LKML

On tui annotation, the title was set to name of the target symbol if
user selects the target. However it remained after returning to original
symbol from the target. Fix it.

Signed-off-by: Namhyung Kim <namhyung.kim@lge.com>
---
 tools/perf/util/ui/browsers/annotate.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/tools/perf/util/ui/browsers/annotate.c b/tools/perf/util/ui/browsers/annotate.c
index 374d3bc570b2..e73357770d5d 100644
--- a/tools/perf/util/ui/browsers/annotate.c
+++ b/tools/perf/util/ui/browsers/annotate.c
@@ -343,6 +343,7 @@ static int annotate_browser__run(struct annotate_browser *self, int evidx,
 				pthread_mutex_unlock(&notes->lock);
 				symbol__tui_annotate(target, ms->map, evidx,
 						     timer, arg, delay_secs);
+				ui_browser__show_title(&self->b, sym->name);
 			}
 			continue;
 		case K_LEFT:
-- 
1.7.9


^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [PATCH 4/5] perf annotate: Fix help string on tui
  2012-02-23  8:46 [PATCH 0/5] perf annotate: Random tiny cleanups Namhyung Kim
                   ` (2 preceding siblings ...)
  2012-02-23  8:46 ` [PATCH 3/5] perf annotate: Restore title when came back to original symbol Namhyung Kim
@ 2012-02-23  8:46 ` Namhyung Kim
  2012-03-05 16:23   ` [tip:perf/core] " tip-bot for Namhyung Kim
  2012-02-23  8:46 ` [PATCH 5/5] perf annotate: Add missing newline on error message Namhyung Kim
  2012-03-03 19:36 ` [PATCH 0/5] perf annotate: Random tiny cleanups Arnaldo Carvalho de Melo
  5 siblings, 1 reply; 12+ messages in thread
From: Namhyung Kim @ 2012-02-23  8:46 UTC (permalink / raw)
  To: Arnaldo Carvalho de Melo
  Cc: Peter Zijlstra, Paul Mackerras, Ingo Molnar, Namhyung Kim, LKML

Separate multiple binding using /, capitalize descriptions,
add missing key binding.

Signed-off-by: Namhyung Kim <namhyung.kim@lge.com>
---
 tools/perf/util/ui/browsers/annotate.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/perf/util/ui/browsers/annotate.c b/tools/perf/util/ui/browsers/annotate.c
index e73357770d5d..57a4c6ef3fd2 100644
--- a/tools/perf/util/ui/browsers/annotate.c
+++ b/tools/perf/util/ui/browsers/annotate.c
@@ -233,9 +233,9 @@ static int annotate_browser__run(struct annotate_browser *self, int evidx,
 	struct rb_node *nd = NULL;
 	struct map_symbol *ms = self->b.priv;
 	struct symbol *sym = ms->sym;
-	const char *help = "<-, ESC: exit, TAB/shift+TAB: cycle hottest lines, "
-			   "H: Hottest, -> Line action, S -> Toggle source "
-			   "code view";
+	const char *help = "<-/ESC: Exit, TAB/shift+TAB: Cycle hot lines, "
+			   "H: Go to hottest line, ->/ENTER: Line action, "
+			   "S: Toggle source code view";
 	int key;
 
 	if (ui_browser__show(&self->b, sym->name, help) < 0)
-- 
1.7.9


^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [PATCH 5/5] perf annotate: Add missing newline on error message
  2012-02-23  8:46 [PATCH 0/5] perf annotate: Random tiny cleanups Namhyung Kim
                   ` (3 preceding siblings ...)
  2012-02-23  8:46 ` [PATCH 4/5] perf annotate: Fix help string on tui Namhyung Kim
@ 2012-02-23  8:46 ` Namhyung Kim
  2012-03-05 16:23   ` [tip:perf/core] " tip-bot for Namhyung Kim
  2012-03-03 19:36 ` [PATCH 0/5] perf annotate: Random tiny cleanups Arnaldo Carvalho de Melo
  5 siblings, 1 reply; 12+ messages in thread
From: Namhyung Kim @ 2012-02-23  8:46 UTC (permalink / raw)
  To: Arnaldo Carvalho de Melo
  Cc: Peter Zijlstra, Paul Mackerras, Ingo Molnar, Namhyung Kim, LKML

If perf.data couldn't find vmlinux image for the given build-id,
it would print error message. However it lacked a newline at the
end, so the output looked like below:

 $ perf annotate --stdio
 No vmlinux file with build id 63b554b2e90f14a4bced200008865e757d3e8b36
 was found in the path.

 Please use:

   perf buildid-cache -av vmlinux

 or:

   --vmlinux vmlinux Percent |   Source code & Disassembly of a.out
 ------------------------------------------------
          :
          :
          :
          :      Disassembly of section .text:
          :
          :      00000000004004f4 <foo>:
     0.00 :        4004f4:       push   %rbp
     0.00 :        4004f5:       mov    %rsp,%rbp
     0.00 :        4004f8:       movl   $0x0,-0x4(%rbp)
     0.00 :        4004ff:       jmp    400517 <foo+0x23>
    14.70 :        400501:       mov    0x200b28(%rip),%rax        # 601030 <count>
     0.02 :        400508:       add    $0x1,%rax
     0.01 :        40050c:       mov    %rax,0x200b1d(%rip)        # 601030 <count>
     0.01 :        400513:       addl   $0x1,-0x4(%rbp)
    13.92 :        400517:       cmpl   $0x98967f,-0x4(%rbp)
    71.33 :        40051e:       jle    400501 <foo+0xd>
     0.00 :        400520:       leaveq
     0.00 :        400521:       retq

Fix it by adding a newline at the end of the message. It doesn't affect
the tui output AFAICS. New output will look like this:

 ...
 or:

   --vmlinux vmlinux
  Percent |   Source code & Disassembly of a.out
 ------------------------------------------------
          :
          :
          :
          :      Disassembly of section .text:
 ...

Signed-off-by: Namhyung Kim <namhyung.kim@lge.com>
---
 tools/perf/util/annotate.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
index 011ed2676604..e5a462f1d07c 100644
--- a/tools/perf/util/annotate.c
+++ b/tools/perf/util/annotate.c
@@ -315,7 +315,7 @@ fallback:
 		       "Please use:\n\n"
 		       "  perf buildid-cache -av vmlinux\n\n"
 		       "or:\n\n"
-		       "  --vmlinux vmlinux",
+		       "  --vmlinux vmlinux\n",
 		       sym->name, build_id_msg ?: "");
 		goto out_free_filename;
 	}
-- 
1.7.9


^ permalink raw reply related	[flat|nested] 12+ messages in thread
* Re: [PATCH 0/5] perf annotate: Random tiny cleanups
  2012-02-23  8:46 [PATCH 0/5] perf annotate: Random tiny cleanups Namhyung Kim
                   ` (4 preceding siblings ...)
  2012-02-23  8:46 ` [PATCH 5/5] perf annotate: Add missing newline on error message Namhyung Kim
@ 2012-03-03 19:36 ` Arnaldo Carvalho de Melo
  5 siblings, 0 replies; 12+ messages in thread
From: Arnaldo Carvalho de Melo @ 2012-03-03 19:36 UTC (permalink / raw)
  To: Namhyung Kim
  Cc: Peter Zijlstra, Paul Mackerras, Ingo Molnar, Namhyung Kim, LKML

Em Thu, Feb 23, 2012 at 05:46:19PM +0900, Namhyung Kim escreveu:
> Hello,
> 
> This is a patchset tries to fix and improve what I found during code reading.
> Please take a look and consider applying. Comments are welcome, of course.

Thanks, applied all of them,

- Arnaldo

^ permalink raw reply	[flat|nested] 12+ messages in thread
* [tip:perf/core] perf annotate: Print asm code as blue when source code is displayed
  2012-02-23  8:46 ` [PATCH 1/5] perf annotate: Print asm code as blue when source code is displayed Namhyung Kim
@ 2012-03-05 16:20   ` tip-bot for Namhyung Kim
  0 siblings, 0 replies; 12+ messages in thread
From: tip-bot for Namhyung Kim @ 2012-03-05 16:20 UTC (permalink / raw)
  To: linux-tip-commits
  Cc: acme, linux-kernel, paulus, hpa, mingo, a.p.zijlstra,
	namhyung.kim, namhyung, tglx, mingo

Commit-ID:  58e817d997d162682717dcaae39393dcadf5f296
Gitweb:     http://git.kernel.org/tip/58e817d997d162682717dcaae39393dcadf5f296
Author:     Namhyung Kim <namhyung.kim@lge.com>
AuthorDate: Thu, 23 Feb 2012 17:46:20 +0900
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Mon, 5 Mar 2012 10:15:50 -0300

perf annotate: Print asm code as blue when source code is displayed

Print unselected asm code lines as blue. This is what we do now for
--stdio.

Cc: Ingo Molnar <mingo@elte.hu>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1329986784-4916-2-git-send-email-namhyung.kim@lge.com
Signed-off-by: Namhyung Kim <namhyung.kim@lge.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/util/ui/browsers/annotate.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/tools/perf/util/ui/browsers/annotate.c b/tools/perf/util/ui/browsers/annotate.c
index 295a9c9..76caae9 100644
--- a/tools/perf/util/ui/browsers/annotate.c
+++ b/tools/perf/util/ui/browsers/annotate.c
@@ -69,14 +69,17 @@ static void annotate_browser__write(struct ui_browser *self, void *entry, int ro
 	if (!self->navkeypressed)
 		width += 1;
 
+	if (!ab->hide_src_code && ol->offset != -1)
+		if (!current_entry || (self->use_navkeypressed &&
+				       !self->navkeypressed))
+			ui_browser__set_color(self, HE_COLORSET_CODE);
+
 	if (!*ol->line)
 		slsmg_write_nstring(" ", width - 18);
 	else
 		slsmg_write_nstring(ol->line, width - 18);
 
-	if (!current_entry)
-		ui_browser__set_color(self, HE_COLORSET_CODE);
-	else
+	if (current_entry)
 		ab->selection = ol;
 }
 

^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [tip:perf/core] perf annotate: Handle lower case key code in annotate_browser__run()
  2012-02-23  8:46 ` [PATCH 2/5] perf annotate: Handle lower case key code in annotate_browser__run() Namhyung Kim
@ 2012-03-05 16:21   ` tip-bot for Namhyung Kim
  0 siblings, 0 replies; 12+ messages in thread
From: tip-bot for Namhyung Kim @ 2012-03-05 16:21 UTC (permalink / raw)
  To: linux-tip-commits
  Cc: acme, linux-kernel, paulus, hpa, mingo, a.p.zijlstra,
	namhyung.kim, namhyung, tglx, mingo

Commit-ID:  ef7c537221160c285704997a913fb66ddc1fe6bc
Gitweb:     http://git.kernel.org/tip/ef7c537221160c285704997a913fb66ddc1fe6bc
Author:     Namhyung Kim <namhyung.kim@lge.com>
AuthorDate: Thu, 23 Feb 2012 17:46:21 +0900
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Mon, 5 Mar 2012 10:15:50 -0300

perf annotate: Handle lower case key code in annotate_browser__run()

Accepting upper case character only is unconvenient since it requires
SHIFT key too. Why not change to it accept a simple key stroke?

Cc: Ingo Molnar <mingo@elte.hu>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1329986784-4916-3-git-send-email-namhyung.kim@lge.com
Signed-off-by: Namhyung Kim <namhyung.kim@lge.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/util/ui/browsers/annotate.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/tools/perf/util/ui/browsers/annotate.c b/tools/perf/util/ui/browsers/annotate.c
index 76caae9..374d3bc5 100644
--- a/tools/perf/util/ui/browsers/annotate.c
+++ b/tools/perf/util/ui/browsers/annotate.c
@@ -287,9 +287,11 @@ static int annotate_browser__run(struct annotate_browser *self, int evidx,
 				nd = self->curr_hot;
 			break;
 		case 'H':
+		case 'h':
 			nd = self->curr_hot;
 			break;
 		case 'S':
+		case 's':
 			if (annotate_browser__toggle_source(self))
 				ui_helpline__puts(help);
 			continue;

^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [tip:perf/core] perf annotate: Restore title when came back to original symbol
  2012-02-23  8:46 ` [PATCH 3/5] perf annotate: Restore title when came back to original symbol Namhyung Kim
@ 2012-03-05 16:22   ` tip-bot for Namhyung Kim
  0 siblings, 0 replies; 12+ messages in thread
From: tip-bot for Namhyung Kim @ 2012-03-05 16:22 UTC (permalink / raw)
  To: linux-tip-commits
  Cc: acme, linux-kernel, paulus, hpa, mingo, a.p.zijlstra,
	namhyung.kim, namhyung, tglx, mingo

Commit-ID:  142cfbd0a0353bbcf4ce62f1d4b4ffaa5fe228f9
Gitweb:     http://git.kernel.org/tip/142cfbd0a0353bbcf4ce62f1d4b4ffaa5fe228f9
Author:     Namhyung Kim <namhyung.kim@lge.com>
AuthorDate: Thu, 23 Feb 2012 17:46:22 +0900
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Mon, 5 Mar 2012 10:15:50 -0300

perf annotate: Restore title when came back to original symbol

On tui annotation, the title was set to name of the target symbol if
user selects the target. However it remained after returning to original
symbol from the target. Fix it.

Cc: Ingo Molnar <mingo@elte.hu>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1329986784-4916-4-git-send-email-namhyung.kim@lge.com
Signed-off-by: Namhyung Kim <namhyung.kim@lge.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/util/ui/browsers/annotate.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/tools/perf/util/ui/browsers/annotate.c b/tools/perf/util/ui/browsers/annotate.c
index 374d3bc5..e733577 100644
--- a/tools/perf/util/ui/browsers/annotate.c
+++ b/tools/perf/util/ui/browsers/annotate.c
@@ -343,6 +343,7 @@ static int annotate_browser__run(struct annotate_browser *self, int evidx,
 				pthread_mutex_unlock(&notes->lock);
 				symbol__tui_annotate(target, ms->map, evidx,
 						     timer, arg, delay_secs);
+				ui_browser__show_title(&self->b, sym->name);
 			}
 			continue;
 		case K_LEFT:

^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [tip:perf/core] perf annotate: Fix help string on tui
  2012-02-23  8:46 ` [PATCH 4/5] perf annotate: Fix help string on tui Namhyung Kim
@ 2012-03-05 16:23   ` tip-bot for Namhyung Kim
  0 siblings, 0 replies; 12+ messages in thread
From: tip-bot for Namhyung Kim @ 2012-03-05 16:23 UTC (permalink / raw)
  To: linux-tip-commits
  Cc: acme, linux-kernel, paulus, hpa, mingo, a.p.zijlstra,
	namhyung.kim, namhyung, tglx, mingo

Commit-ID:  824ac0e9838aadf5a398850c80ec2a43b9d0ca49
Gitweb:     http://git.kernel.org/tip/824ac0e9838aadf5a398850c80ec2a43b9d0ca49
Author:     Namhyung Kim <namhyung.kim@lge.com>
AuthorDate: Thu, 23 Feb 2012 17:46:23 +0900
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Mon, 5 Mar 2012 10:15:50 -0300

perf annotate: Fix help string on tui

Separate multiple binding using /, capitalize descriptions, add missing
key binding.

Cc: Ingo Molnar <mingo@elte.hu>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1329986784-4916-5-git-send-email-namhyung.kim@lge.com
Signed-off-by: Namhyung Kim <namhyung.kim@lge.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/util/ui/browsers/annotate.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/perf/util/ui/browsers/annotate.c b/tools/perf/util/ui/browsers/annotate.c
index e733577..57a4c6e 100644
--- a/tools/perf/util/ui/browsers/annotate.c
+++ b/tools/perf/util/ui/browsers/annotate.c
@@ -233,9 +233,9 @@ static int annotate_browser__run(struct annotate_browser *self, int evidx,
 	struct rb_node *nd = NULL;
 	struct map_symbol *ms = self->b.priv;
 	struct symbol *sym = ms->sym;
-	const char *help = "<-, ESC: exit, TAB/shift+TAB: cycle hottest lines, "
-			   "H: Hottest, -> Line action, S -> Toggle source "
-			   "code view";
+	const char *help = "<-/ESC: Exit, TAB/shift+TAB: Cycle hot lines, "
+			   "H: Go to hottest line, ->/ENTER: Line action, "
+			   "S: Toggle source code view";
 	int key;
 
 	if (ui_browser__show(&self->b, sym->name, help) < 0)

^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [tip:perf/core] perf annotate: Add missing newline on error message
  2012-02-23  8:46 ` [PATCH 5/5] perf annotate: Add missing newline on error message Namhyung Kim
@ 2012-03-05 16:23   ` tip-bot for Namhyung Kim
  0 siblings, 0 replies; 12+ messages in thread
From: tip-bot for Namhyung Kim @ 2012-03-05 16:23 UTC (permalink / raw)
  To: linux-tip-commits
  Cc: acme, linux-kernel, paulus, hpa, mingo, a.p.zijlstra,
	namhyung.kim, namhyung, tglx, mingo

Commit-ID:  ff2a6617c2acd6a8dc468c90ab8708a6ad112bb0
Gitweb:     http://git.kernel.org/tip/ff2a6617c2acd6a8dc468c90ab8708a6ad112bb0
Author:     Namhyung Kim <namhyung.kim@lge.com>
AuthorDate: Thu, 23 Feb 2012 17:46:24 +0900
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Mon, 5 Mar 2012 10:15:50 -0300

perf annotate: Add missing newline on error message

If perf.data couldn't find vmlinux image for the given build-id,
it would print error message. However it lacked a newline at the
end, so the output looked like below:

 $ perf annotate --stdio
 No vmlinux file with build id 63b554b2e90f14a4bced200008865e757d3e8b36
 was found in the path.

 Please use:

   perf buildid-cache -av vmlinux

 or:

   --vmlinux vmlinux Percent |   Source code & Disassembly of a.out
 ------------------------------------------------
          :
          :
          :
          :      Disassembly of section .text:
          :
          :      00000000004004f4 <foo>:
     0.00 :        4004f4:       push   %rbp
     0.00 :        4004f5:       mov    %rsp,%rbp
     0.00 :        4004f8:       movl   $0x0,-0x4(%rbp)
     0.00 :        4004ff:       jmp    400517 <foo+0x23>
    14.70 :        400501:       mov    0x200b28(%rip),%rax        # 601030 <count>
     0.02 :        400508:       add    $0x1,%rax
     0.01 :        40050c:       mov    %rax,0x200b1d(%rip)        # 601030 <count>
     0.01 :        400513:       addl   $0x1,-0x4(%rbp)
    13.92 :        400517:       cmpl   $0x98967f,-0x4(%rbp)
    71.33 :        40051e:       jle    400501 <foo+0xd>
     0.00 :        400520:       leaveq
     0.00 :        400521:       retq

Fix it by adding a newline at the end of the message. It doesn't affect
the tui output AFAICS. New output will look like this:

 ...
 or:

   --vmlinux vmlinux
  Percent |   Source code & Disassembly of a.out
 ------------------------------------------------
          :
          :
          :
          :      Disassembly of section .text:
 ...

Cc: Ingo Molnar <mingo@elte.hu>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1329986784-4916-6-git-send-email-namhyung.kim@lge.com
Signed-off-by: Namhyung Kim <namhyung.kim@lge.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/util/annotate.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
index 011ed26..e5a462f 100644
--- a/tools/perf/util/annotate.c
+++ b/tools/perf/util/annotate.c
@@ -315,7 +315,7 @@ fallback:
 		       "Please use:\n\n"
 		       "  perf buildid-cache -av vmlinux\n\n"
 		       "or:\n\n"
-		       "  --vmlinux vmlinux",
+		       "  --vmlinux vmlinux\n",
 		       sym->name, build_id_msg ?: "");
 		goto out_free_filename;
 	}

^ permalink raw reply related	[flat|nested] 12+ messages in thread
end of thread, other threads:[~2012-03-05 16:24 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-02-23  8:46 [PATCH 0/5] perf annotate: Random tiny cleanups Namhyung Kim
2012-02-23  8:46 ` [PATCH 1/5] perf annotate: Print asm code as blue when source code is displayed Namhyung Kim
2012-03-05 16:20   ` [tip:perf/core] " tip-bot for Namhyung Kim
2012-02-23  8:46 ` [PATCH 2/5] perf annotate: Handle lower case key code in annotate_browser__run() Namhyung Kim
2012-03-05 16:21   ` [tip:perf/core] " tip-bot for Namhyung Kim
2012-02-23  8:46 ` [PATCH 3/5] perf annotate: Restore title when came back to original symbol Namhyung Kim
2012-03-05 16:22   ` [tip:perf/core] " tip-bot for Namhyung Kim
2012-02-23  8:46 ` [PATCH 4/5] perf annotate: Fix help string on tui Namhyung Kim
2012-03-05 16:23   ` [tip:perf/core] " tip-bot for Namhyung Kim
2012-02-23  8:46 ` [PATCH 5/5] perf annotate: Add missing newline on error message Namhyung Kim
2012-03-05 16:23   ` [tip:perf/core] " tip-bot for Namhyung Kim
2012-03-03 19:36 ` [PATCH 0/5] perf annotate: Random tiny cleanups Arnaldo Carvalho de Melo

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).