From 7c5b6f8c5285c1ddb8604875a48c7798367cf8ad Mon Sep 17 00:00:00 2001 From: Luminarys Date: Mon, 24 Aug 2015 15:44:58 -0500 Subject: Added in backtrace printing --- include/log.h | 1 + sway/log.c | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/include/log.h b/include/log.h index 3d77769c..945ad239 100644 --- a/include/log.h +++ b/include/log.h @@ -16,6 +16,7 @@ void sway_log(log_importance_t verbosity, const char* format, ...) __attribute__ void sway_log_errno(log_importance_t verbosity, char* format, ...) __attribute__((format(printf,2,3))); void sway_abort(const char* format, ...) __attribute__((format(printf,1,2))); bool sway_assert(bool condition, const char* format, ...) __attribute__((format(printf,2,3))); +void error_handler(int sig); void layout_log(const swayc_t *c, int depth); #endif diff --git a/sway/log.c b/sway/log.c index a7d73d5c..bea30837 100644 --- a/sway/log.c +++ b/sway/log.c @@ -8,6 +8,7 @@ #include #include #include +#include int colored = 1; log_importance_t v = L_SILENT; @@ -30,6 +31,8 @@ void init_log(log_importance_t verbosity) { fcntl(fd[i], F_SETFD, flag | FD_CLOEXEC); } } + signal(SIGSEGV, error_handler); + signal(SIGABRT, error_handler); } void sway_log_colors(int mode) { @@ -114,6 +117,28 @@ bool sway_assert(bool condition, const char* format, ...) { return false; } +void error_handler(int sig) { + int i; + int max_lines = 20; + void *array[max_lines]; + char **bt; + size_t bt_len; + + sway_log(L_ERROR, "Error: Signal %d. Printing backtrace", sig); + bt_len = backtrace(array, max_lines); + bt = backtrace_symbols(array, bt_len); + if (!bt) { + sway_log(L_ERROR, "Could not allocate sufficient memory for backtrace_symbols(), falling back to stderr"); + backtrace_symbols_fd(array, bt_len, STDERR_FILENO); + exit(1); + } + + for (i = 0; (size_t)i < bt_len; i++) { + sway_log(L_ERROR, "Backtrace: %s", bt[i]); + } + exit(1); +} + #include "workspace.h" /* XXX:DEBUG:XXX */ -- cgit v1.2.3-54-g00ecf