evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

perf ui annotate browser: Allow toggling addr offset view

Browse source 
The lines in objdump have this format:

    ffffffff8126543f:       jne    ffffffff81265494 <__list_del_entry+0x84>
<SNIP>
    ffffffff81265494:       mov    %rdi,%rcx

Since we now have objdump_line allowing tools to print the offset
independently from the rest of the line, allow toggling a view where
just offsets from the start of the function are shown:

     2f:       jne    ffffffff81265494 <__list_del_entry+0x84>
<SNIP>
     84:       mov    %rdi,%rcx

The offset view will be the default as soon as operations that deal with
offsets in a function are handled accodringly, i.e. in offset view the
above will become:

     2f:       jne    __list_del_entry+0x84
<SNIP>
     84:       mov    %rdi,%rcx

And then a follow up patch will allow navigating thru jumps, just like
we handle callq instructions.

Suggested-by: Linus Torvalds <torvalds@linux-foundation.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@gmail.com>
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-4zpgimmz8xv7b5c920el7s45@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Arnaldo Carvalho de Melo 2012-04-02 13:21:55 -03:00
parent 058b4cc9af
commit e235f3f3bf
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
tools/perf/util/ui/browsers/annotate.c
View file

@ -20,6 +20,7 @@ struct annotate_browser {
int nr_asm_entries; int nr_asm_entries;
int nr_entries; int nr_entries;
bool hide_src_code; bool hide_src_code;
bool use_offset;
}; };
struct objdump_line_rb_node { struct objdump_line_rb_node {
@ -82,10 +83,13 @@ static void annotate_browser__write(struct ui_browser *self, void *entry, int ro
slsmg_write_nstring(ol->line, width - 18); slsmg_write_nstring(ol->line, width - 18);
else { else {
char bf[64]; char bf[64];
u64 addr = ab->start + ol->offset; u64 addr = ol->offset;
int printed = scnprintf(bf, sizeof(bf), " %" PRIx64 ":", addr); int printed, color = -1;
int color = -1;
if (!ab->use_offset)
addr += ab->start;
printed = scnprintf(bf, sizeof(bf), " %" PRIx64 ":", addr);
if (change_color) if (change_color)
color = ui_browser__set_color(self, HE_COLORSET_ADDR); color = ui_browser__set_color(self, HE_COLORSET_ADDR);
slsmg_write_nstring(bf, printed); slsmg_write_nstring(bf, printed);
@ -250,6 +254,7 @@ static int annotate_browser__run(struct annotate_browser *self, int evidx,
struct symbol *sym = ms->sym; struct symbol *sym = ms->sym;
const char *help = "<-/ESC: Exit, TAB/shift+TAB: Cycle hot lines, " const char *help = "<-/ESC: Exit, TAB/shift+TAB: Cycle hot lines, "
"H: Go to hottest line, ->/ENTER: Line action, " "H: Go to hottest line, ->/ENTER: Line action, "
"O: Toggle offset view, "
"S: Toggle source code view"; "S: Toggle source code view";
int key; int key;
@ -310,6 +315,10 @@ static int annotate_browser__run(struct annotate_browser *self, int evidx,
if (annotate_browser__toggle_source(self)) if (annotate_browser__toggle_source(self))
ui_helpline__puts(help); ui_helpline__puts(help);
continue; continue;
case 'O':
case 'o':
self->use_offset = !self->use_offset;
continue;
case K_ENTER: case K_ENTER:
case K_RIGHT: case K_RIGHT:
if (self->selection == NULL) { if (self->selection == NULL) {