Merge "Reserve realtime signal for libprofile-extras" am: 3e742cb613

am: 5375df8f61

Change-Id: Idc187c0ba2d02242fba6787149d225ecf4e898a9
This commit is contained in:
Pirama Arumuga Nainar 2019-03-29 09:22:09 -07:00 committed by android-build-merger
commit ae30661b8c
2 changed files with 4 additions and 2 deletions

View file

@ -52,7 +52,7 @@ static __inline int __ndk_legacy___libc_current_sigrtmax() {
static __inline int __ndk_legacy___libc_current_sigrtmin() {
if (__libc_current_sigrtmin) return __libc_current_sigrtmin();
return __SIGRTMIN + 5; /* Should match __libc_current_sigrtmin. */
return __SIGRTMIN + 6; /* Should match __libc_current_sigrtmin. */
}
#undef SIGRTMAX

View file

@ -40,11 +40,12 @@
// 34 (__SIGRTMIN + 2) libcore
// 35 (__SIGRTMIN + 3) debuggerd -b
// 36 (__SIGRTMIN + 4) heapprofd
// 37 (__SIGRTMIN + 5) coverage (libprofile-extras)
//
// If you change this, also change __ndk_legacy___libc_current_sigrtmin
// in <android/legacy_signal_inlines.h> to match.
#define __SIGRT_RESERVED 5
#define __SIGRT_RESERVED 6
static inline __always_inline sigset64_t filter_reserved_signals(sigset64_t sigset, int how) {
int (*block)(sigset64_t*, int);
int (*unblock)(sigset64_t*, int);
@ -70,5 +71,6 @@ static inline __always_inline sigset64_t filter_reserved_signals(sigset64_t sigs
unblock(&sigset, __SIGRTMIN + 2);
unblock(&sigset, __SIGRTMIN + 3);
unblock(&sigset, __SIGRTMIN + 4);
unblock(&sigset, __SIGRTMIN + 5);
return sigset;
}