overhaul pthread cancellation

[musl] / src / internal / pthread_impl.h

diff --git a/src/internal/pthread_impl.h b/src/internal/pthread_impl.h
index f2d0ae8..304bf98 100644 (file)
--- a/src/internal/pthread_impl.h
+++ b/src/internal/pthread_impl.h
@@ -24,7 +24,8 @@ struct pthread {
        unsigned long tlsdesc[4];
        pid_t tid, pid;
        int tsd_used, errno_val, *errno_ptr;
-       volatile int canceldisable, cancelasync, cancelpoint, cancel;
+       volatile uintptr_t cp_sp, cp_ip;
+       volatile int cancel, canceldisable, cancelasync;
        unsigned char *map_base;
        size_t map_size;
        void *start_arg;
@@ -42,12 +43,11 @@ struct pthread {
                void *pending;
        } robust_list;
        int unblock_cancel;
+       int delete_timer;
 };
 
 struct __timer {
        int timerid;
-       union sigval val;
-       void (*notify)(union sigval);
        pthread_t thread;
 };
 
@@ -77,6 +77,7 @@ struct __timer {
 
 #define SIGCANCEL 32
 #define SIGSYSCALL 33
+#define SIGTIMER 34
 
 int __set_thread_area(void *);
 int __libc_sigaction(int, const struct sigaction *, struct sigaction *);
@@ -85,9 +86,13 @@ void __lock(volatile int *);
 void __unmapself(void *, size_t);
 
 int __timedwait(volatile int *, int, clockid_t, const struct timespec *, int);
+int __timedwait_cp(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