* @author Jose Fonseca <jfonseca@vmware.com>
*/
-#include "u_debug.h"
+#include "util/u_debug.h"
#include "u_debug_symbol.h"
#include "u_debug_stack.h"
+#include "pipe/p_config.h"
#if defined(HAVE_LIBUNWIND)
#endif
#include <dlfcn.h>
+#include "os/os_thread.h"
+#include "util/hash_table.h"
+
+static struct hash_table* symbols_hash;
+static mtx_t symbols_mutex = _MTX_INITIALIZER_NP;
+
+/* TODO with some refactoring we might be able to re-use debug_symbol_name_cached()
+ * instead.. otoh if using libunwind I think u_debug_symbol could just be excluded
+ * from build?
+ */
+static const char *
+symbol_name_cached(unw_cursor_t *cursor, unw_proc_info_t *pip)
+{
+ void *addr = (void *)(uintptr_t)pip->start_ip;
+ char *name;
+
+ mtx_lock(&symbols_mutex);
+ if(!symbols_hash)
+ symbols_hash = _mesa_pointer_hash_table_create(NULL);
+ struct hash_entry *entry = _mesa_hash_table_search(symbols_hash, addr);
+ if (!entry) {
+ char procname[256];
+ unw_word_t off;
+ int ret;
+
+ ret = unw_get_proc_name(cursor, procname, sizeof(procname), &off);
+ if (ret && ret != -UNW_ENOMEM) {
+ procname[0] = '?';
+ procname[1] = 0;
+ }
+
+ if (asprintf(&name, "%s%s", procname, ret == -UNW_ENOMEM ? "..." : "") == -1)
+ name = "??";
+ entry = _mesa_hash_table_insert(symbols_hash, addr, (void*)name);
+ }
+ mtx_unlock(&symbols_mutex);
+
+ return entry->data;
+}
+
void
debug_backtrace_capture(struct debug_stack_frame *backtrace,
unsigned start_frame,
unw_context_t context;
unw_proc_info_t pip;
unsigned i = 0;
- int ret;
pip.unwind_info = NULL;
start_frame--;
while ((i < nr_frames) && (unw_step(&cursor) > 0)) {
- char procname[256];
- const char *filename;
- unw_word_t off;
- Dl_info dlinfo;
+ unw_word_t ip;
+ unw_get_reg(&cursor, UNW_REG_IP, &ip);
unw_get_proc_info(&cursor, &pip);
- ret = unw_get_proc_name(&cursor, procname, 256, &off);
- if (ret && ret != -UNW_ENOMEM) {
- procname[0] = '?';
- procname[1] = 0;
- }
-
- if (dladdr((void *)(uintptr_t)(pip.start_ip + off), &dlinfo) && dlinfo.dli_fname &&
- *dlinfo.dli_fname)
- filename = dlinfo.dli_fname;
- else
- filename = "?";
-
- snprintf(backtrace[i].buf, sizeof(backtrace[i].buf),
- "%u: %s (%s%s+0x%x) [%p]", i, filename, procname,
- ret == -UNW_ENOMEM ? "..." : "", (int)off,
- (void *)(uintptr_t)(pip.start_ip + off));
+ backtrace[i].start_ip = pip.start_ip;
+ backtrace[i].off = ip - pip.start_ip;
+ backtrace[i].procname = symbol_name_cached(&cursor, &pip);
i++;
}
while (i < nr_frames) {
- backtrace[i].buf[0] = '\0';
+ backtrace[i].start_ip = 0;
i++;
}
}
+static const void *
+frame_ip(const struct debug_stack_frame *frame)
+{
+ return (void *)(uintptr_t)(frame->start_ip + frame->off);
+}
+
+static const char *
+frame_info(const struct debug_stack_frame *frame, unsigned *offset)
+{
+ Dl_info dlinfo;
+ const void *addr = frame_ip(frame);
+
+
+ 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 "?";
+}
+
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].buf[0] == '\0')
+ if (!backtrace[i].start_ip)
break;
- debug_printf("\t%s\n", backtrace[i].buf);
+ 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]));
}
}
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].buf[0] == '\0')
+ if (!backtrace[i].start_ip)
break;
- fprintf(f, "\t%s\n", backtrace[i].buf);
+ 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]));
}
}
-
+#elif defined(ANDROID)
+ /* Not implemented here; see u_debug_stack_android.cpp */
#else /* ! HAVE_LIBUNWIND */
#if defined(PIPE_OS_WINDOWS)
}
#endif
-#if defined(PIPE_CC_GCC)
+#if defined(PIPE_CC_GCC) && (PIPE_CC_GCC_VERSION > 404) || defined(__clang__)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wframe-address"
frame_pointer = ((const void **)__builtin_frame_address(1));
+#pragma GCC diagnostic pop
#elif defined(PIPE_CC_MSVC) && defined(PIPE_ARCH_X86)
__asm {
mov frame_pointer, ebp