lkml.org 
[lkml]   [2012]   [Apr]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3/8] perf ui annotate browser: Allow toggling addr offset view
    Date
    From: Arnaldo Carvalho de Melo <acme@redhat.com>

    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>
    ---
    tools/perf/util/ui/browsers/annotate.c | 15 ++++++++++++---
    1 file changed, 12 insertions(+), 3 deletions(-)

    diff --git a/tools/perf/util/ui/browsers/annotate.c b/tools/perf/util/ui/browsers/annotate.c
    index 7ac7dd0..5cf9b78 100644
    --- a/tools/perf/util/ui/browsers/annotate.c
    +++ b/tools/perf/util/ui/browsers/annotate.c
    @@ -20,6 +20,7 @@ struct annotate_browser {
    int nr_asm_entries;
    int nr_entries;
    bool hide_src_code;
    + bool use_offset;
    };

    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);
    else {
    char bf[64];
    - u64 addr = ab->start + ol->offset;
    - int printed = scnprintf(bf, sizeof(bf), " %" PRIx64 ":", addr);
    - int color = -1;
    + u64 addr = ol->offset;
    + int printed, color = -1;

    + if (!ab->use_offset)
    + addr += ab->start;
    +
    + printed = scnprintf(bf, sizeof(bf), " %" PRIx64 ":", addr);
    if (change_color)
    color = ui_browser__set_color(self, HE_COLORSET_ADDR);
    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;
    const char *help = "<-/ESC: Exit, TAB/shift+TAB: Cycle hot lines, "
    "H: Go to hottest line, ->/ENTER: Line action, "
    + "O: Toggle offset view, "
    "S: Toggle source code view";
    int key;

    @@ -310,6 +315,10 @@ static int annotate_browser__run(struct annotate_browser *self, int evidx,
    if (annotate_browser__toggle_source(self))
    ui_helpline__puts(help);
    continue;
    + case 'O':
    + case 'o':
    + self->use_offset = !self->use_offset;
    + continue;
    case K_ENTER:
    case K_RIGHT:
    if (self->selection == NULL) {
    --
    1.7.9.2.358.g22243


    \
     
     \ /
      Last update: 2012-04-07 22:57    [W:0.027 / U:61.732 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site