reorganize pthread data structures and move the definitions to alltypes.h

[musl] / src / internal / pthread_impl.h

diff --git a/src/internal/pthread_impl.h b/src/internal/pthread_impl.h
index b789210..615af70 100644 (file)
--- a/src/internal/pthread_impl.h
+++ b/src/internal/pthread_impl.h
@@ -20,9 +20,10 @@
 #define pthread __pthread
 
 struct pthread {
-       struct pthread *self, *join;
-       int errno_val;
+       struct pthread *self;
+       unsigned long tlsdesc[4];
        pid_t tid, pid;
+       int tsd_used, errno_val, *errno_ptr;
        volatile int canceldisable, cancelasync, cancelpoint, cancel;
        unsigned char *map_base;
        size_t map_size;
@@ -32,27 +33,37 @@ struct pthread {
        jmp_buf exit_jmp_buf;
        int detached;
        int exitlock;
-       unsigned long tlsdesc[4];
        struct __ptcb *cancelbuf;
        void **tsd;
-       int tsd_used;
        pthread_attr_t attr;
-       int *errno_ptr;
 };
 
-static inline struct pthread *__pthread_self()
-{
-       struct pthread *self;
-       __asm__ ("movl %%gs:0,%0" : "=r" (self) );
-       return self;
-}
+#define __SU (sizeof(size_t)/sizeof(int))
+
+#define _a_stacksize __u.__s[0]
+#define _a_guardsize __u.__s[1]
+#define _a_detach __u.__i[2*__SU+0]
+#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 _c_block __u.__i[0]
+#define _rw_wrlock __u.__i[0]
+#define _rw_readers __u.__i[1]
+#define _rw_waiters __u.__i[2]
+#define _rw_owner __u.__i[3]
+#define _b_count __u.__i[0]
+#define _b_limit __u.__i[1]
+#define _b_left __u.__i[2]
+#define _b_waiters __u.__i[3]
+
+#include "pthread_arch.h"
 
 #define SIGCANCEL 32
 #define SIGSYSCALL 33
 #define SIGTIMER  32 /* ?? */
 
-int __set_thread_area(unsigned long *);
-int __set_pthread_self(void *);
+int __set_thread_area(void *);
 int __libc_sigaction(int, const struct sigaction *, struct sigaction *);
 int __libc_sigprocmask(int, const sigset_t *, sigset_t *);
 void __lock(volatile int *);