diff options
| author |   Arnaldo Carvalho de Melo <acme@redhat.com> | 2011-10-06 09:45:29 -0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2011-10-07 17:00:42 -0300 |
| commit | 234a5375f6e7dee1f8bd5a7a2f5107c1c265ad8e (patch) | |
| tree | 37ad38d0d639fce72b1811ebac6cdd7fddc6b19e /tools/perf | |
| parent | perf tools: Fix broken number of samples for perf report -n (diff) | |
| download | linux-dev-234a5375f6e7dee1f8bd5a7a2f5107c1c265ad8e.tar.xz linux-dev-234a5375f6e7dee1f8bd5a7a2f5107c1c265ad8e.zip | |
perf annotate browser: Use -> to navigate on assembly lines
And add better explanations when the line isn't actionable, like non
assembly lines and on other instructions.
Suggested-by: Ingo Molnar <mingo@elte.hu>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-375n844b5wra7lgq08ou153j@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to '')
| -rw-r--r-- | tools/perf/util/ui/browsers/annotate.c | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/tools/perf/util/ui/browsers/annotate.c b/tools/perf/util/ui/browsers/annotate.c index 77421bab8fdd..674b55e686fd 100644 --- a/tools/perf/util/ui/browsers/annotate.c +++ b/tools/perf/util/ui/browsers/annotate.c @@ -184,8 +184,8 @@ static int annotate_browser__run(struct annotate_browser *self, int evidx, int key; if (ui_browser__show(&self->b, sym->name, - "<-, -> or ESC: exit, TAB/shift+TAB: " - "cycle hottest lines, H: Hottest") < 0) + "<- or ESC: exit, TAB/shift+TAB: " + "cycle hottest lines, H: Hottest, -> Line action") < 0) return -1; ui_browser__add_exit_keys(&self->b, exit_keys); @@ -245,24 +245,39 @@ static int annotate_browser__run(struct annotate_browser *self, int evidx, nd = self->curr_hot; break; case NEWT_KEY_ENTER: - if (self->selection != NULL) { + case NEWT_KEY_RIGHT: + if (self->selection == NULL) { + ui_helpline__puts("Huh? No selection. Report to linux-kernel@vger.kernel.org"); + continue; + } + + if (self->selection->offset == -1) { + ui_helpline__puts("Actions are only available for assembly lines."); + continue; + } else { char *s = strstr(self->selection->line, "callq "); struct annotation *notes; struct symbol *target; u64 ip; - if (s == NULL) + if (s == NULL) { + ui_helpline__puts("Actions are only available for the 'callq' instruction."); continue; + } s = strchr(s, ' '); - if (s++ == NULL) + if (s++ == NULL) { + ui_helpline__puts("Invallid callq instruction."); continue; + } ip = strtoull(s, NULL, 16); ip = ms->map->map_ip(ms->map, ip); target = map__find_symbol(ms->map, ip, NULL); - if (target == NULL) + if (target == NULL) { + ui_helpline__puts("The called function was not found."); continue; + } notes = symbol__annotation(target); pthread_mutex_lock(¬es->lock); |