[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-d964b1cdbd94f359f1f65f81440be84ceb45978e@git.kernel.org>
Date: Mon, 14 Aug 2017 10:48:52 -0700
From: tip-bot for Milian Wolff <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: yao.jin@...ux.intel.com, namhyung@...nel.org, acme@...hat.com,
hpa@...or.com, linux-kernel@...r.kernel.org, mingo@...nel.org,
tglx@...utronix.de, a.p.zijlstra@...llo.nl, dsahern@...il.com,
milian.wolff@...b.com
Subject: [tip:perf/core] perf srcline: Do not consider empty files as valid
srclines
Commit-ID: d964b1cdbd94f359f1f65f81440be84ceb45978e
Gitweb: http://git.kernel.org/tip/d964b1cdbd94f359f1f65f81440be84ceb45978e
Author: Milian Wolff <milian.wolff@...b.com>
AuthorDate: Sun, 6 Aug 2017 23:24:45 +0200
Committer: Arnaldo Carvalho de Melo <acme@...hat.com>
CommitDate: Fri, 11 Aug 2017 16:06:31 -0300
perf srcline: Do not consider empty files as valid srclines
Sometimes we get a non-null, but empty, string for the filename from
bfd. This then results in srclines of the form ":0", which is different
from the canonical SRCLINE_UNKNOWN in the form "??:0". Set the file to
NULL if it is empty to fix this.
Signed-off-by: Milian Wolff <milian.wolff@...b.com>
Cc: David Ahern <dsahern@...il.com>
Cc: Namhyung Kim <namhyung@...nel.org>
Cc: Peter Zijlstra <a.p.zijlstra@...llo.nl>
Cc: Yao Jin <yao.jin@...ux.intel.com>
Link: http://lkml.kernel.org/r/20170806212446.24925-14-milian.wolff@kdab.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@...hat.com>
---
tools/perf/util/srcline.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/tools/perf/util/srcline.c b/tools/perf/util/srcline.c
index ebc88a7..ed8e8d2 100644
--- a/tools/perf/util/srcline.c
+++ b/tools/perf/util/srcline.c
@@ -155,6 +155,9 @@ static void find_address_in_section(bfd *abfd, asection *section, void *data)
a2l->found = bfd_find_nearest_line(abfd, section, a2l->syms, pc - vma,
&a2l->filename, &a2l->funcname,
&a2l->line);
+
+ if (a2l->filename && !strlen(a2l->filename))
+ a2l->filename = NULL;
}
static struct a2l_data *addr2line_init(const char *path)
@@ -248,6 +251,9 @@ static int addr2line(const char *dso_name, u64 addr,
&a2l->funcname, &a2l->line) &&
cnt++ < MAX_INLINE_NEST) {
+ if (a2l->filename && !strlen(a2l->filename))
+ a2l->filename = NULL;
+
if (node != NULL) {
if (inline_list__append_dso_a2l(dso, node))
return 0;
Powered by blists - more mailing lists