X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Finternal%2Fpthread_impl.h;h=3e436aefc94e02ba2c35fb716dccf3629ebb6497;hb=2063c4cac27f118c21dcb9352e8a4903131c88c8;hp=c17401113107079c6d0c44b402055f7914cabb54;hpb=5fcebcde6aeba6ae4a339790beba5331fbcd3b6e;p=musl

diff --git a/src/internal/pthread_impl.h b/src/internal/pthread_impl.h
index c1740111..3e436aef 100644
--- a/src/internal/pthread_impl.h
+++ b/src/internal/pthread_impl.h
@@ -30,13 +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))
@@ -47,8 +58,9 @@ 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_count __u.__i[4]
+#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]
@@ -64,7 +76,6 @@ struct pthread {
 
 #define SIGCANCEL 32
 #define SIGSYSCALL 33
-#define SIGTIMER  32 /* ?? */
 
 int __set_thread_area(void *);
 int __libc_sigaction(int, const struct sigaction *, struct sigaction *);
@@ -76,6 +87,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