AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gallium/util: tweak backtrace format with libunwind

Browse Source 
To work with addr2line.sh we also need the relative offset within the
DSO.  And addr2line.sh gets confused by the leading stackframe number.

Signed-off-by: Rob Clark <robdclark@gmail.com>
This commit is contained in:
Rob Clark
2017-04-04 13:01:56 -04:00
parent 91dfa02125
commit 3b32ec3ba6
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/auxiliary/util/u_debug_stack.c
+16 -10
View File
@@ -143,15 +143,19 @@ frame_ip(const struct debug_stack_frame *frame)
}
static const char *
frame_filename(const struct debug_stack_frame *frame)
frame_info(const struct debug_stack_frame *frame, unsigned *offset)
{
Dl_info dlinfo;
const void *addr = frame_ip(frame);
if (dladdr(frame_ip(frame), &dlinfo) && dlinfo.dli_fname &&
*dlinfo.dli_fname)
return dlinfo.dli_fname;
if (dladdr(addr, &dlinfo) && dlinfo.dli_fname &&
*dlinfo.dli_fname) {
*offset = (unsigned)((uintptr_t)addr - (uintptr_t)dlinfo.dli_fbase);
return dlinfo.dli_fname;
}
*offset = 0;
return "?";
}
@@ -159,13 +163,14 @@ void
debug_backtrace_dump(const struct debug_stack_frame *backtrace,
unsigned nr_frames)
{
unsigned i;
unsigned i, offset;
const char *filename;
for (i = 0; i < nr_frames; ++i) {
if (!backtrace[i].start_ip)
break;
debug_printf("\t%u: %s (%s+0x%x) [%p]\n", i,
frame_filename(&backtrace[i]),
filename = frame_info(&backtrace[i], &offset);
debug_printf("\t%s(+0x%x) (%s+0x%x) [%p]\n", filename, offset,
backtrace[i].procname, backtrace[i].off,
frame_ip(&backtrace[i]));
}
@@ -176,13 +181,14 @@ debug_backtrace_print(FILE *f,
const struct debug_stack_frame *backtrace,
unsigned nr_frames)
{
unsigned i;
unsigned i, offset;
const char *filename;
for (i = 0; i < nr_frames; ++i) {
if (!backtrace[i].start_ip)
break;
fprintf(f, "\t%u: %s (%s+0x%x) [%p]\n", i,
frame_filename(&backtrace[i]),
filename = frame_info(&backtrace[i], &offset);
fprintf(f, "\t%s(+0x%x) (%s+0x%x) [%p]\n", filename, offset,
backtrace[i].procname, backtrace[i].off,
frame_ip(&backtrace[i]));
}