denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

backtrace: add an alternative stack unwinding implementation using libunwind

Browse Source
This commit is contained in:
Martin Willi
2013-05-06 15:15:24 +02:00
parent d8f6f0c01c
commit 83714577a9
3 changed files with 44 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/Makefile.am
+1 -1
View File
@@ -79,7 +79,7 @@ endif
library.lo : $(top_builddir)/config.status
libstrongswan_la_LIBADD = $(PTHREADLIB) $(DLLIB) $(BTLIB) $(SOCKLIB) $(RTLIB) $(BFDLIB)
libstrongswan_la_LIBADD = $(PTHREADLIB) $(DLLIB) $(BTLIB) $(SOCKLIB) $(RTLIB) $(BFDLIB) $(UNWINDLIB)
INCLUDES = -I$(top_srcdir)/src/libstrongswan
AM_CFLAGS = \
src/libstrongswan/utils/backtrace.c
+34 -5
View File
@@ -373,7 +373,7 @@ void backtrace_deinit() {}
METHOD(backtrace_t, log_, void,
private_backtrace_t *this, FILE *file, bool detailed)
{
#ifdef HAVE_BACKTRACE
#if defined(HAVE_BACKTRACE) || defined(HAVE_LIBUNWIND_H)
size_t i;
char **strings;
@@ -420,9 +420,9 @@ METHOD(backtrace_t, log_, void,
}
}
free (strings);
#else /* !HAVE_BACKTRACE */
println(file, "C library does not support backtrace().");
#endif /* HAVE_BACKTRACE */
#else /* !HAVE_BACKTRACE && !HAVE_LIBUNWIND_H */
println(file, "no support for backtrace()/libunwind");
#endif /* HAVE_BACKTRACE/HAVE_LIBUNWIND_H */
}
METHOD(backtrace_t, contains_function, bool,
@@ -518,6 +518,33 @@ METHOD(backtrace_t, destroy, void,
free(this);
}
#ifdef HAVE_LIBUNWIND_H
#define UNW_LOCAL_ONLY
#include <libunwind.h>
/**
* libunwind variant for glibc backtrace()
*/
static inline int backtrace_unwind(void **frames, int count)
{
unw_context_t context;
unw_cursor_t cursor;
unw_word_t ip;
int depth = 0;
unw_getcontext(&context);
unw_init_local(&cursor, &context);
do
{
unw_get_reg(&cursor, UNW_REG_IP, &ip);
frames[depth++] = (void*)ip;
}
while (depth < count && unw_step(&cursor) > 0);
return depth;
}
#endif /* HAVE_UNWIND */
/**
* See header
*/
@@ -527,7 +554,9 @@ backtrace_t *backtrace_create(int skip)
void *frames[50];
int frame_count = 0;
#ifdef HAVE_BACKTRACE
#ifdef HAVE_LIBUNWIND_H
frame_count = backtrace_unwind(frames, countof(frames));
#elif defined(HAVE_BACKTRACE)
frame_count = backtrace(frames, countof(frames));
#endif /* HAVE_BACKTRACE */
frame_count = max(frame_count - skip, 0);