From: Andi Kleen <andi@firstfloor.org>
To: jolsa@redhat.com
Cc: linux-kernel@vger.kernel.org, namhyung@kernel.org,
acme@infradead.org, Andi Kleen <ak@linux.intel.com>
Subject: [PATCH 8/9] tools, perf: Make srcline output address with -v
Date: Fri, 20 Jun 2014 16:41:30 -0700 [thread overview]
Message-ID: <1403307691-30776-9-git-send-email-andi@firstfloor.org> (raw)
In-Reply-To: <1403307691-30776-1-git-send-email-andi@firstfloor.org>
From: Andi Kleen <ak@linux.intel.com>
When -v is specified always print the hex address for the srcline.
Signed-off-by: Andi Kleen <ak@linux.intel.com>
---
tools/perf/util/srcline.c | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/tools/perf/util/srcline.c b/tools/perf/util/srcline.c
index 36a7aff..a22be7c 100644
--- a/tools/perf/util/srcline.c
+++ b/tools/perf/util/srcline.c
@@ -258,6 +258,12 @@ char *get_srcline(struct dso *dso, unsigned long addr, struct symbol *sym,
unsigned line = 0;
char *srcline;
const char *dso_name;
+ char astr[50];
+
+ if (verbose)
+ snprintf(astr, sizeof astr, " %#lx", addr);
+ else
+ astr[0] = 0;
if (!dso->has_srcline)
goto out;
@@ -276,7 +282,12 @@ char *get_srcline(struct dso *dso, unsigned long addr, struct symbol *sym,
if (!addr2line(dso_name, addr, &file, &line, dso))
goto out;
- if (asprintf(&srcline, "%s:%u", basename(file), line) < 0) {
+ if (line == 0) {
+ free(file);
+ goto fallback;
+ }
+
+ if (asprintf(&srcline, "%s:%u%s", basename(file), line, astr) < 0) {
free(file);
goto out;
}
@@ -291,9 +302,10 @@ out:
dso->has_srcline = 0;
dso__free_a2l(dso);
}
+fallback:
if (sym) {
- if (asprintf(&srcline, "%s+%ld", show_sym ? sym->name : "",
- addr - sym->start) < 0)
+ if (asprintf(&srcline, "%s+%ld%s", show_sym ? sym->name : "",
+ addr - sym->start, astr) < 0)
return SRCLINE_UNKNOWN;
} else if (asprintf(&srcline, "%s[%lx]", dso->short_name, addr) < 0)
return SRCLINE_UNKNOWN;
--
1.9.3
next prev parent reply other threads:[~2014-06-20 23:41 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-20 23:41 perf: Implement lbr-as-callgraph v8 Andi Kleen
2014-06-20 23:41 ` [PATCH 1/9] perf, tools: Support handling complete branch stacks as histograms v7 Andi Kleen
2014-06-20 23:41 ` [PATCH 2/9] perf, tools: Add --branch-history option to report v3 Andi Kleen
2014-06-20 23:41 ` [PATCH 3/9] perf, tools: Enable printing the srcline in the history v4 Andi Kleen
2014-06-20 23:41 ` [PATCH 4/9] perf, tools: Only print base source file for srcline Andi Kleen
2014-06-20 23:41 ` [PATCH 5/9] perf, tools: Support source line numbers in annotate Andi Kleen
2014-06-20 23:41 ` [PATCH 6/9] perf, tools: Fix srcline sort key output to use width Andi Kleen
2014-06-20 23:41 ` [PATCH 7/9] tools, perf: Make get_srcline fall back to sym+offset Andi Kleen
2014-06-20 23:41 ` Andi Kleen [this message]
2014-06-20 23:41 ` [PATCH 9/9] tools, perf: Add asprintf replacement Andi Kleen
-- strict thread matches above, loose matches on Subject: below --
2014-07-31 17:17 Implement lbr-as-callgraph v9 Andi Kleen
2014-07-31 17:17 ` [PATCH 8/9] tools, perf: Make srcline output address with -v Andi Kleen
2014-05-16 17:05 Implement lbr-as-callgraph v7 Andi Kleen
2014-05-16 17:05 ` [PATCH 8/9] tools, perf: Make srcline output address with -v Andi Kleen
2014-05-12 23:20 mplement lbr-as-callgraph v6 Andi Kleen
2014-05-12 23:20 ` [PATCH 8/9] tools, perf: Make srcline output address with -v Andi Kleen
2014-05-16 9:53 ` Jiri Olsa
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1403307691-30776-9-git-send-email-andi@firstfloor.org \
--to=andi@firstfloor.org \
--cc=acme@infradead.org \
--cc=ak@linux.intel.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=namhyung@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome