lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Mon, 15 Sep 2014 16:54:32 -0700 From: Andi Kleen <andi@...stfloor.org> To: peterz@...radead.org Cc: linux-kernel@...r.kernel.org, mingo@...nel.org, eranian@...gle.com, Andi Kleen <ak@...ux.intel.com> Subject: [PATCH 7/8] tools, perf: Make srcline output address with -v From: Andi Kleen <ak@...ux.intel.com> When -v is specified always print the hex address for the srcline. Signed-off-by: Andi Kleen <ak@...ux.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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists