new lock algorithm with state and congestion count in one atomic int

[musl] / src / internal / pthread_impl.h

diff --git a/src/internal/pthread_impl.h b/src/internal/pthread_impl.h
index 3890bb5..602d6f5 100644 (file)
--- a/src/internal/pthread_impl.h
+++ b/src/internal/pthread_impl.h
@@ -30,7 +30,6 @@ struct pthread {
        void *result;
        struct __ptcb *cancelbuf;
        void **tsd;
-       pthread_attr_t attr;
        volatile int dead;
        struct {
                volatile void *volatile head;
@@ -98,6 +97,10 @@ struct __timer {
 #define DTP_OFFSET 0
 #endif
 
+#ifndef tls_mod_off_t
+#define tls_mod_off_t size_t
+#endif
+
 #define SIGTIMER 32
 #define SIGCANCEL 33
 #define SIGSYNCCALL 34
@@ -128,11 +131,17 @@ int __timedwait_cp(volatile int *, int, clockid_t, const struct timespec *, int)
 void __wait(volatile int *, volatile int *, int, int);
 static inline void __wake(volatile void *addr, int cnt, int priv)
 {
-       if (priv) priv = 128;
+       if (priv) priv = FUTEX_PRIVATE;
        if (cnt<0) cnt = INT_MAX;
        __syscall(SYS_futex, addr, FUTEX_WAKE|priv, cnt) != -ENOSYS ||
        __syscall(SYS_futex, addr, FUTEX_WAKE, cnt);
 }
+static inline void __futexwait(volatile void *addr, int val, int priv)
+{
+       if (priv) priv = FUTEX_PRIVATE;
+       __syscall(SYS_futex, addr, FUTEX_WAIT|priv, val) != -ENOSYS ||
+       __syscall(SYS_futex, addr, FUTEX_WAIT, val);
+}
 
 void __acquire_ptc(void);
 void __release_ptc(void);
@@ -143,7 +152,7 @@ void __block_app_sigs(void *);
 void __restore_sigs(void *);
 
 #define DEFAULT_STACK_SIZE 81920
-#define DEFAULT_GUARD_SIZE PAGE_SIZE
+#define DEFAULT_GUARD_SIZE 4096
 
 #define __ATTRP_C11_THREAD ((void*)(uintptr_t)-1)