<div dir="ltr">I'm not a fan at all. This API is really bad compared to what's provided by libbacktrace, which is super simple. This also seem to require callbacks that have "Linux" in the name. Why are we trying to get rid of libbacktrace, and what's the schedule for this? </div><div class="gmail_extra"> <div class="gmail_quote">On Tue, Oct 29, 2013 at 7:25 PM, Peter Hutterer <<a href="mailto:peter.hutterer@who-t.net" target="_blank">peter.hutterer@who-t.net</a>> wrote: <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">From Jan Kratochvil: There is a longterm plan to obsolete libunwind from Fedora by new elfutils unwinder. But xorg-x11-server does not even need any external (non-glibc) unwinder. According to e21e183059df5975e7086850d1931edb2c1bbd06 you do only self-backtrace (called local unwinding by libunwind). glibc backtrace() can do the same. According to the sample backtrace in the patch above the backtrace addresses there are the same in before/after cases, libunwind only adds resolving of address -> symbol name there, IIUC. address -> symbol name resolving can be done with RH-supported elfutils package. X.Org Bug 70746 <<a href="http://bugs.freedesktop.org/show_bug.cgi?id=70746" target="_blank">http://bugs.freedesktop.org/show_bug.cgi?id=70746</a>> Cc: Marcin Slusarz <<a href="mailto:marcin.slusarz@gmail.com">marcin.slusarz@gmail.com</a>> Cc: Jan Kratochvil <<a href="mailto:jan.kratochvil@redhat.com">jan.kratochvil@redhat.com</a>> Signed-off-by: Peter Hutterer <<a href="mailto:peter.hutterer@who-t.net">peter.hutterer@who-t.net</a>> --- This may need some extra linux checks... <a href="http://configure.ac" target="_blank">configure.ac</a> | 10 ++++-- include/<a href="http://dix-config.h.in" target="_blank">dix-config.h.in</a> | 3 ++ os/backtrace.c | 91 +++++++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 99 insertions(+), 5 deletions(-) diff --git a/<a href="http://configure.ac" target="_blank">configure.ac</a> b/<a href="http://configure.ac" target="_blank">configure.ac</a> index d36aefc..0e589f8 100644 --- a/<a href="http://configure.ac" target="_blank">configure.ac</a> +++ b/<a href="http://configure.ac" target="_blank">configure.ac</a> @@ -308,6 +308,12 @@ AC_CHECK_HEADER([execinfo.h],[ ])] ) +dnl elfutils for backtrace symbol lookup +AC_CHECK_HEADER([elfutils/libdwfl.h], + [AC_DEFINE(HAVE_ELFUTILS, 1, [Has elfutils]) + ELFUTILS_LIBS="-ldw"]) +AC_SUBST(ELFUTILS_LIBS) + dnl --------------------------------------------------------------------------- dnl Bus options and CPU capabilities. Replaces logic in dnl hw/xfree86/os-support/bus/Makefile.am, among others. @@ -1339,10 +1345,10 @@ AC_DEFINE(BIGREQS, 1, [Support BigRequests extension]) if test "x$SPECIAL_DTRACE_OBJECTS" = "xyes" ; then DIX_LIB='$(top_builddir)/dix/dix.O' - OS_LIB='$(top_builddir)/os/os.O $(SHA1_LIBS) $(DLOPEN_LIBS)' + OS_LIB='$(top_builddir)/os/os.O $(SHA1_LIBS) $(DLOPEN_LIBS) $(ELFUTILS_LIBS)' else DIX_LIB='$(top_builddir)/dix/<a href="http://libdix.la" target="_blank">libdix.la</a>' - OS_LIB='$(top_builddir)/os/<a href="http://libos.la" target="_blank">libos.la</a>' + OS_LIB='$(top_builddir)/os/<a href="http://libos.la" target="_blank">libos.la</a> $(ELFUTILS_LIBS)' fi AC_SUBST([DIX_LIB]) AC_SUBST([OS_LIB]) diff --git a/include/<a href="http://dix-config.h.in" target="_blank">dix-config.h.in</a> b/include/<a href="http://dix-config.h.in" target="_blank">dix-config.h.in</a> index e1cb9eb..c7c0a8a 100644 --- a/include/<a href="http://dix-config.h.in" target="_blank">dix-config.h.in</a> +++ b/include/<a href="http://dix-config.h.in" target="_blank">dix-config.h.in</a> @@ -60,6 +60,9 @@ /* Has backtrace support */ #undef HAVE_BACKTRACE +/* Has elfutils */ +#undef HAVE_ELFUTILS + /* Define to 1 if you have the <byteswap.h> header file. */ #undef HAVE_BYTESWAP_H diff --git a/os/backtrace.c b/os/backtrace.c index c807bd2..acf110a 100644 --- a/os/backtrace.c +++ b/os/backtrace.c @@ -37,6 +37,89 @@ #include <dlfcn.h> #include <execinfo.h> +#ifdef HAVE_ELFUTILS +#include <unistd.h> +#include <elfutils/libdwfl.h> + +static Dwfl* +dwfl_get(void) +{ + static char *debuginfo_path; + static Dwfl *dwfl; + + static const Dwfl_Callbacks proc_callbacks = { + .find_debuginfo = dwfl_standard_find_debuginfo, + .debuginfo_path = &debuginfo_path, + .find_elf = dwfl_linux_proc_find_elf, + }; + + if (dwfl) + return dwfl; + + dwfl = dwfl_begin(&proc_callbacks); + if (!dwfl) + return NULL; + + errno = 0; + if (dwfl_linux_proc_report(dwfl, getpid ()) != 0 || + dwfl_report_end(dwfl, NULL, NULL) != 0) + { + ErrorFSigSafe("dwfl reporting: %s\n", sterror(errno)); + dwfl_end(dwfl); + dwfl = NULL; + abort(); + } + + return dwfl; +} + +struct getmodules_callback_arg { + void *addr; + const char *name; +}; + +static int +getmodules_callback(Dwfl_Module *module, + void **userdata, + const char *module_name, + Dwarf_Addr module_low_addr, void *arg) +{ + struct getmodules_callback_arg *cbarg = arg; + cbarg->name = dwfl_module_addrname(module, (GElf_Addr)cbarg->addr); + return cbarg->name ? DWARF_CB_ABORT : DWARF_CB_OK; +} + +static const char* +addr_lookup(void *addr) +{ + Dwfl *dwfl = dwfl_get(); + struct getmodules_callback_arg arg; + + <a href="http://arg.name" target="_blank">arg.name</a> = NULL; + arg.addr = addr; + dwfl_getmodules(dwfl, getmodules_callback, &arg, 0); + return <a href="http://arg.name" target="_blank">arg.name</a>; +} +#endif + +static const char* +symbol_name(void *addr, void *fbase) +{ + const char *name = NULL; + +#ifdef HAVE_ELFUTILS + name = addr_lookup(addr); +#endif + + if (!name) { + static char buf[20]; + sprintf(buf, "%p", fbase); + name = buf; + } + + return name; +} + void xorg_backtrace(void) { @@ -66,15 +149,17 @@ xorg_backtrace(void) (unsigned int)((char *) array[i] - (char *) info.dli_saddr), array[i]); - else + else { + const char *name = symbol_name(array[i], info.dli_fbase); ErrorFSigSafe( - "%u: %s (%p+0x%x) [%p]\n", + "%u: %s (%s+0x%x) [%p]\n", i, mod, - info.dli_fbase, + name, (unsigned int)((char *) array[i] - (char *) info.dli_fbase), array[i]); + } } ErrorFSigSafe("\n"); } -- 1.8.3.1 _______________________________________________ <a href="mailto:xorg-devel@lists.x.org">xorg-devel@lists.x.org</a>: X.Org development Archives: <a href="http://lists.x.org/archives/xorg-devel" target="_blank">http://lists.x.org/archives/xorg-devel</a> Info: <a href="http://lists.x.org/mailman/listinfo/xorg-devel" target="_blank">http://lists.x.org/mailman/listinfo/xorg-devel</a> </blockquote></div> -- Jasper </div>