tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Move sigrtmin.h into platform headers.

Browse source 
Test: mma
Change-Id: Ibc97ef96fe9e32b948c245b06039b95fe4342f39
This commit is contained in:
Josh Gao 2019-12-13 13:55:53 -08:00
parent 4956c372cf
commit 5074e7d28f
8 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libc/Android.bp
View file

@ -1808,6 +1808,7 @@ cc_library_headers {
"//frameworks:__subpackages__", "//frameworks:__subpackages__",
"//external/perfetto:__subpackages__", "//external/perfetto:__subpackages__",
"//external/scudo:__subpackages__", "//external/scudo:__subpackages__",
"//system/core/debuggerd:__subpackages__",
], ],
host_supported: true, host_supported: true,
recovery_available: true, recovery_available: true,

2
libc/bionic/__libc_current_sigrtmin.cpp
View file

@ -28,7 +28,7 @@
#include <signal.h> #include <signal.h>
#include "private/sigrtmin.h" #include <platform/bionic/reserved_signals.h>
int __libc_current_sigrtmin() { int __libc_current_sigrtmin() {
return __SIGRTMIN + __SIGRT_RESERVED; return __SIGRTMIN + __SIGRT_RESERVED;

4
libc/bionic/fdsan.cpp
View file

@ -40,6 +40,7 @@
#include <unistd.h> #include <unistd.h>
#include <async_safe/log.h> #include <async_safe/log.h>
#include <platform/bionic/reserved_signals.h>
#include <sys/system_properties.h> #include <sys/system_properties.h>
#include "private/bionic_globals.h" #include "private/bionic_globals.h"
@ -168,8 +169,7 @@ __printflike(1, 0) static void fdsan_error(const char* fmt, ...) {
ANDROID_FDSAN_ERROR_LEVEL_DISABLED); ANDROID_FDSAN_ERROR_LEVEL_DISABLED);
__BIONIC_FALLTHROUGH; __BIONIC_FALLTHROUGH;
case ANDROID_FDSAN_ERROR_LEVEL_WARN_ALWAYS: case ANDROID_FDSAN_ERROR_LEVEL_WARN_ALWAYS:
// DEBUGGER_SIGNAL inline_raise(BIONIC_SIGNAL_DEBUGGER, &abort_message);
inline_raise(__SIGRTMIN + 3, &abort_message);
break; break;
case ANDROID_FDSAN_ERROR_LEVEL_FATAL: case ANDROID_FDSAN_ERROR_LEVEL_FATAL:

3
libc/bionic/poll.cpp
View file

@ -30,8 +30,9 @@
#include <sys/poll.h> #include <sys/poll.h>
#include <sys/select.h> #include <sys/select.h>
#include <platform/bionic/reserved_signals.h>
#include "private/bionic_time_conversions.h" #include "private/bionic_time_conversions.h"
#include "private/sigrtmin.h"
#include "private/SigSetConverter.h" #include "private/SigSetConverter.h"
extern "C" int __ppoll(pollfd*, unsigned int, timespec*, const sigset64_t*, size_t); extern "C" int __ppoll(pollfd*, unsigned int, timespec*, const sigset64_t*, size_t);

2
libc/bionic/sigaction.cpp
View file

@ -29,7 +29,7 @@
#include <signal.h> #include <signal.h>
#include <string.h> #include <string.h>
#include "private/sigrtmin.h" #include <platform/bionic/reserved_signals.h>
extern "C" void __restore_rt(void); extern "C" void __restore_rt(void);
extern "C" void __restore(void); extern "C" void __restore(void);

3
libc/bionic/signal.cpp
View file

@ -36,9 +36,10 @@
#include <time.h> #include <time.h>
#include <unistd.h> #include <unistd.h>
#include <platform/bionic/reserved_signals.h>
#include "private/ErrnoRestorer.h" #include "private/ErrnoRestorer.h"
#include "private/SigSetConverter.h" #include "private/SigSetConverter.h"
#include "private/sigrtmin.h"
extern "C" int __rt_sigpending(const sigset64_t*, size_t); extern "C" int __rt_sigpending(const sigset64_t*, size_t);
extern "C" int __rt_sigqueueinfo(pid_t, int, siginfo_t*); extern "C" int __rt_sigqueueinfo(pid_t, int, siginfo_t*);

3
libc/bionic/sigprocmask.cpp
View file

@ -29,7 +29,8 @@
#include <errno.h> #include <errno.h>
#include <signal.h> #include <signal.h>
#include "private/sigrtmin.h" #include <platform/bionic/reserved_signals.h>
#include "private/SigSetConverter.h" #include "private/SigSetConverter.h"
extern "C" int __rt_sigprocmask(int, const sigset64_t*, sigset64_t*, size_t); extern "C" int __rt_sigprocmask(int, const sigset64_t*, sigset64_t*, size_t);

6
libc/private/sigrtmin.h → libc/platform/bionic/reserved_signals.h
View file

@ -32,13 +32,13 @@
#include <signal.h> #include <signal.h>
#include "platform/bionic/macros.h" #include "macros.h"
// Realtime signals reserved for internal use: // Realtime signals reserved for internal use:
// 32 (__SIGRTMIN + 0) POSIX timers // 32 (__SIGRTMIN + 0) POSIX timers
// 33 (__SIGRTMIN + 1) libbacktrace // 33 (__SIGRTMIN + 1) libbacktrace
// 34 (__SIGRTMIN + 2) libcore // 34 (__SIGRTMIN + 2) libcore
// 35 (__SIGRTMIN + 3) debuggerd -b // 35 (__SIGRTMIN + 3) debuggerd
// 36 (__SIGRTMIN + 4) heapprofd native dumps // 36 (__SIGRTMIN + 4) heapprofd native dumps
// 37 (__SIGRTMIN + 5) coverage (libprofile-extras) // 37 (__SIGRTMIN + 5) coverage (libprofile-extras)
// 38 (__SIGRTMIN + 6) heapprofd ART managed heap dumps // 38 (__SIGRTMIN + 6) heapprofd ART managed heap dumps
@ -46,6 +46,8 @@
// If you change this, also change __ndk_legacy___libc_current_sigrtmin // If you change this, also change __ndk_legacy___libc_current_sigrtmin
// in <android/legacy_signal_inlines.h> to match. // in <android/legacy_signal_inlines.h> to match.
#define BIONIC_SIGNAL_DEBUGGER __SIGRTMIN + 3
#define __SIGRT_RESERVED 7 #define __SIGRT_RESERVED 7
static inline __always_inline sigset64_t filter_reserved_signals(sigset64_t sigset, int how) { static inline __always_inline sigset64_t filter_reserved_signals(sigset64_t sigset, int how) {
int (*block)(sigset64_t*, int); int (*block)(sigset64_t*, int);