use a separate signal from SIGCANCEL for SIGEV_THREAD timers

[musl] / src / internal / pthread_impl.h

diff --git a/src/internal/pthread_impl.h b/src/internal/pthread_impl.h
index 615af70..a6d90e9 100644 (file)
--- a/src/internal/pthread_impl.h
+++ b/src/internal/pthread_impl.h
@@ -30,12 +30,24 @@ struct pthread {
        void *start_arg;
        void *(*start)(void *);
        void *result;
-       jmp_buf exit_jmp_buf;
        int detached;
        int exitlock;
        struct __ptcb *cancelbuf;
        void **tsd;
        pthread_attr_t attr;
+       volatile int dead;
+       struct {
+               void **head;
+               long off;
+               void *pending;
+       } robust_list;
+       int unblock_cancel;
+       int delete_timer;
+};
+
+struct __timer {
+       int timerid;
+       pthread_t thread;
 };
 
 #define __SU (sizeof(size_t)/sizeof(int))
@@ -46,8 +58,11 @@ struct pthread {
 #define _m_type __u.__i[0]
 #define _m_lock __u.__i[1]
 #define _m_waiters __u.__i[2]
-#define _m_owner __u.__i[3]
+#define _m_prev __u.__p[3]
+#define _m_next __u.__p[4]
+#define _m_count __u.__i[5]
 #define _c_block __u.__i[0]
+#define _c_clock __u.__i[1]
 #define _rw_wrlock __u.__i[0]
 #define _rw_readers __u.__i[1]
 #define _rw_waiters __u.__i[2]
@@ -61,7 +76,7 @@ struct pthread {
 
 #define SIGCANCEL 32
 #define SIGSYSCALL 33
-#define SIGTIMER  32 /* ?? */
+#define SIGTIMER 34
 
 int __set_thread_area(void *);
 int __libc_sigaction(int, const struct sigaction *, struct sigaction *);
@@ -73,6 +88,9 @@ int __timedwait(volatile int *, int, clockid_t, const struct timespec *, int);
 void __wait(volatile int *, volatile int *, int, int);
 void __wake(volatile int *, int, int);
 
+void __rsyscall_lock();
+void __rsyscall_unlock();
+
 #define DEFAULT_STACK_SIZE (16384-PAGE_SIZE)
 #define DEFAULT_GUARD_SIZE PAGE_SIZE