lkml.org 
[lkml]   [2013]   [Oct]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH V7 2/7] 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 | 21 ++++++++++-----------
    1 file changed, 10 insertions(+), 11 deletions(-)

    diff --git a/tools/perf/ui/browsers/annotate.c b/tools/perf/ui/browsers/annotate.c
    index 08545ae..57d3a86 100644
    --- a/tools/perf/ui/browsers/annotate.c
    +++ b/tools/perf/ui/browsers/annotate.c
    @@ -442,35 +442,34 @@ static bool annotate_browser__callq(struct annotate_browser *browser,
    {
    struct map_symbol *ms = browser->b.priv;
    struct disasm_line *dl = browser->selection;
    - struct symbol *sym = ms->sym;
    struct annotation *notes;
    - struct symbol *target;
    - u64 ip;
    + struct addr_map_symbol target = {
    + .map = ms->map,
    + .addr = dl->ops.target.addr,
    + };
    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);
    - if (target == NULL) {
    + if (map_groups__find_ams(&target, NULL)) {
    ui_helpline__puts("The called function was not found.");
    return true;
    }

    - notes = symbol__annotation(target);
    + notes = symbol__annotation(target.sym);
    pthread_mutex_lock(&notes->lock);

    - if (notes->src == NULL && symbol__alloc_hist(target) < 0) {
    + if (notes->src == NULL && symbol__alloc_hist(target.sym) < 0) {
    pthread_mutex_unlock(&notes->lock);
    ui__warning("Not enough memory for annotating '%s' symbol!\n",
    - target->name);
    + target.sym->name);
    return true;
    }

    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.sym, target.map, evsel, hbt);
    + sym_title(ms->sym, ms->map, title, sizeof(title));
    ui_browser__show_title(&browser->b, title);
    return true;
    }
    --
    1.7.11.7


    \
     
     \ /
      Last update: 2013-10-14 13:21    [W:4.672 / U:0.804 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site