thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-20 08:40:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Using libunwind for stack trace from signal handler [#CLICKHOUSE-3094].

Browse Source
This commit is contained in:
Alexey Milovidov 2017-06-23 08:16:34 +03:00 committed by alexey-milovidov
parent 324fc7ef3e
commit d823135d24
3 changed files with 34 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
contrib/CMakeLists.txt vendored
View File

@ -32,6 +32,7 @@ add_subdirectory (libcityhash)
add_subdirectory (libfarmhash)
add_subdirectory (libmetrohash)
add_subdirectory (libbtrie)
add_subdirectory (libunwind)
if (USE_INTERNAL_ZLIB_LIBRARY)
add_subdirectory (libzlib-ng)

3
libs/libdaemon/CMakeLists.txt
View File

@ -1,4 +1,5 @@
include_directories (include)
include_directories (${ClickHouse_SOURCE_DIR}/contrib/libunwind/include)
include(${ClickHouse_SOURCE_DIR}/cmake/dbms_include.cmake)
add_library (daemon
@ -11,4 +12,4 @@ add_library (daemon
include/daemon/OwnPatternFormatter.h
)
target_link_libraries (daemon dbms)
target_link_libraries (daemon dbms unwind)

37
libs/libdaemon/src/BaseDaemon.cpp
View File

@ -11,11 +11,16 @@
#include <signal.h>
#include <cxxabi.h>
#include <execinfo.h>
#define UNW_LOCAL_ONLY
#include <libunwind.h>
#ifdef __APPLE__
// ucontext is not available without _XOPEN_SOURCE
#define _XOPEN_SOURCE
#endif
#include <ucontext.h>
#include <typeinfo>
#include <common/logger_useful.h>
#include <common/ErrorHandlers.h>
@ -175,6 +180,30 @@ static void faultSignalHandler(int sig, siginfo_t * info, void * context)
static bool already_printed_stack_trace = false;
size_t backtraceLibUnwind(void ** out_frames, size_t max_frames, ucontext_t & context)
{
if (already_printed_stack_trace)
return 0;
unw_cursor_t cursor;
if (unw_init_local_signal(&cursor, &context) < 0)
return 0;
size_t i = 0;
for (; i < max_frames; ++i)
{
unw_word_t ip;
unw_get_reg(&cursor, UNW_REG_IP, &ip);
out_frames[i] = reinterpret_cast<void*>(ip);
if (!unw_step(&cursor))
break;
}
return i;
}
/** Получает информацию через pipe.
* При получении сигнала HUP / USR1 закрывает лог-файлы.
* При получении информации из std::terminate, выводит её в лог.
@ -293,14 +322,10 @@ private:
static const int max_frames = 50;
void * frames[max_frames];
int frames_size = backtrace(frames, max_frames);
int frames_size = backtraceLibUnwind(frames, max_frames, context);
if (frames_size >= 2)
if (frames_size)
{
/// Overwrite sigaction with caller's address
if (caller_address && (frames_size < 3 || caller_address != frames[2]))
frames[1] = caller_address;
char ** symbols = backtrace_symbols(frames, frames_size);
if (!symbols)