lkml.org 
[lkml]   [2013]   [Sep]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH V2 06/10] perf tools: fix annotate_browser__callq()
    Date
    When following a call, annotate_browser__callq()
    uses the current symbol's map to look up the
    target ip. That will not work if the target ip
    is on a map with a different mapping (i.e.
    start - pgoff is different).

    Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
    ---
    tools/perf/ui/browsers/annotate.c | 10 ++++++----
    1 file changed, 6 insertions(+), 4 deletions(-)

    diff --git a/tools/perf/ui/browsers/annotate.c b/tools/perf/ui/browsers/annotate.c
    index 08545ae..d9edb35 100644
    --- a/tools/perf/ui/browsers/annotate.c
    +++ b/tools/perf/ui/browsers/annotate.c
    @@ -445,14 +445,16 @@ static bool annotate_browser__callq(struct annotate_browser *browser,
    struct symbol *sym = ms->sym;
    struct annotation *notes;
    struct symbol *target;
    + struct map *map;
    u64 ip;
    char title[SYM_TITLE_MAX_SIZE];

    if (!ins__is_call(dl->ins))
    return false;

    - ip = ms->map->map_ip(ms->map, dl->ops.target.addr);
    - target = map__find_symbol(ms->map, ip, NULL);
    + map = ms->map;
    + ip = dl->ops.target.addr;
    + target = map__find_other_map_symbol(&map, &ip, NULL);
    if (target == NULL) {
    ui_helpline__puts("The called function was not found.");
    return true;
    @@ -469,8 +471,8 @@ static bool annotate_browser__callq(struct annotate_browser *browser,
    }

    pthread_mutex_unlock(&notes->lock);
    - symbol__tui_annotate(target, ms->map, evsel, hbt);
    - sym_title(sym, ms->map, title, sizeof(title));
    + symbol__tui_annotate(target, map, evsel, hbt);
    + sym_title(sym, map, title, sizeof(title));
    ui_browser__show_title(&browser->b, title);
    return true;
    }
    --
    1.7.11.7


    \
     
     \ /
      Last update: 2013-09-22 12:41    [W:2.806 / U:0.088 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site