summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2014-04-30 18:30:35 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-04-30 18:30:36 +0000
commitce28fdcf0dd0b8072f7463b7488632cb31cf0fa6 (patch)
treedb15a1da8f60e529679be4e7e6f72254a6c4d91a
parent68a60cd947d394b27d9d44a72d95de8d4448ef32 (diff)
parent6c2959598d8eb91c75718d0777e666dd8f1bfb11 (diff)
downloadlibcore-ce28fdcf0dd0b8072f7463b7488632cb31cf0fa6.zip
libcore-ce28fdcf0dd0b8072f7463b7488632cb31cf0fa6.tar.gz
libcore-ce28fdcf0dd0b8072f7463b7488632cb31cf0fa6.tar.bz2
Merge "Use __SIGRTMIN so bionic can hide our signal from causal passers-by."
-rw-r--r--luni/src/main/native/AsynchronousCloseMonitor.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/luni/src/main/native/AsynchronousCloseMonitor.cpp b/luni/src/main/native/AsynchronousCloseMonitor.cpp
index 92d5260..31cde00 100644
--- a/luni/src/main/native/AsynchronousCloseMonitor.cpp
+++ b/luni/src/main/native/AsynchronousCloseMonitor.cpp
@@ -35,12 +35,13 @@ static pthread_mutex_t blockedThreadListMutex = PTHREAD_MUTEX_INITIALIZER;
static AsynchronousCloseMonitor* blockedThreadList = NULL;
/**
- * The specific signal chosen here is arbitrary.
+ * The specific signal chosen here is arbitrary, but bionic needs to know so that SIGRTMIN
+ * starts at a higher value.
*/
#if defined(__APPLE__)
static const int BLOCKED_THREAD_SIGNAL = SIGUSR2;
#else
-static const int BLOCKED_THREAD_SIGNAL = SIGRTMIN + 2;
+static const int BLOCKED_THREAD_SIGNAL = __SIGRTMIN + 2;
#endif
static void blockedThreadSignalHandler(int /*signal*/) {