lkml.org 
[lkml]   [2013]   [Sep]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5/9] perf tools: Do not try to call addr2line for non-binary files
    Date
    From: Namhyung Kim <namhyung.kim@lge.com>

    No need to call addr2line since they don't have such information.

    Reviewed-by: Jiri Olsa <jolsa@redhat.com>
    Signed-off-by: Namhyung Kim <namhyung@kernel.org>
    ---
    tools/perf/util/sort.c | 3 ---
    tools/perf/util/srcline.c | 11 +++++++++--
    2 files changed, 9 insertions(+), 5 deletions(-)

    diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c
    index 0d633a059df4..113aa92b1191 100644
    --- a/tools/perf/util/sort.c
    +++ b/tools/perf/util/sort.c
    @@ -259,9 +259,6 @@ static int hist_entry__srcline_snprintf(struct hist_entry *self, char *bf,
    if (!self->ms.map)
    goto out_ip;

    - if (!strncmp(self->ms.map->dso->long_name, "/tmp/perf-", 10))
    - goto out_ip;
    -
    path = get_srcline(self->ms.map->dso->long_name, self->ip);
    self->srcline = path;

    diff --git a/tools/perf/util/srcline.c b/tools/perf/util/srcline.c
    index 7e92cca6f502..777f91880cdb 100644
    --- a/tools/perf/util/srcline.c
    +++ b/tools/perf/util/srcline.c
    @@ -57,11 +57,17 @@ char *get_srcline(const char *dso_name, unsigned long addr)
    {
    char *file;
    unsigned line;
    - char *srcline;
    + char *srcline = SRCLINE_UNKNOWN;
    size_t size;

    + if (dso_name[0] == '[')
    + goto out;
    +
    + if (!strncmp(dso_name, "/tmp/perf-", 10))
    + goto out;
    +
    if (!addr2line(dso_name, addr, &file, &line))
    - return SRCLINE_UNKNOWN;
    + goto out;

    /* just calculate actual length */
    size = snprintf(NULL, 0, "%s:%u", file, line) + 1;
    @@ -73,6 +79,7 @@ char *get_srcline(const char *dso_name, unsigned long addr)
    srcline = SRCLINE_UNKNOWN;

    free(file);
    +out:
    return srcline;
    }

    --
    1.7.11.7


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