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

Merge pull request #18764 from azat/sigdescr_np-over-sys_siglist

Browse Source 
Use sigdescr_np() over sys_siglist (fixes glibc 2.32+ unbundled build)
This commit is contained in:
alexey-milovidov 2021-01-07 00:11:42 +03:00 committed by GitHub
commit 7907292bd7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
base/daemon/BaseDaemon.cpp
View File

@ -80,12 +80,24 @@ static void call_default_signal_handler(int sig)
raise(sig);
}
// Apparently strsignal is not instrumented by MemorySanitizer, so we
// have to unpoison it to avoid msan reports inside fmt library when we
// print it.
const char * msan_strsignal(int sig)
{
// Apparently strsignal is not instrumented by MemorySanitizer, so we
// have to unpoison it to avoid msan reports inside fmt library when we
// print it.
// no glibc in osx/freebsd
#if !defined(__GLIBC_PREREQ)
#define __GLIBC_PREREQ(x, y) 0
#endif
// glibc 2.32+ deprecates sys_siglist[]
// newer glibc is a problem only for unbundled build.
#if __GLIBC_PREREQ(2, 32)
const char * signal_name = sigdescr_np(sig);
#else
const char * signal_name = sys_siglist[sig];
#endif
__msan_unpoison_string(signal_name);
return signal_name;
}