projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
clarify that bits headers are included as public headers
[musl]
/
src
/
internal
/
pthread_impl.h
diff --git
a/src/internal/pthread_impl.h
b/src/internal/pthread_impl.h
index
26164d8
..
78b69cd
100644
(file)
--- a/
src/internal/pthread_impl.h
+++ b/
src/internal/pthread_impl.h
@@
-2,17
+2,9
@@
#define _PTHREAD_IMPL_H
#include <pthread.h>
#define _PTHREAD_IMPL_H
#include <pthread.h>
-#include <sched.h>
#include <signal.h>
#include <signal.h>
-#include <unistd.h>
-#include <sys/mman.h>
#include <errno.h>
#include <limits.h>
#include <errno.h>
#include <limits.h>
-#include <inttypes.h>
-#include <setjmp.h>
-#include <string.h>
-#include <time.h>
-#include <locale.h>
#include "libc.h"
#include "syscall.h"
#include "atomic.h"
#include "libc.h"
#include "syscall.h"
#include "atomic.h"
@@
-22,17
+14,20
@@
struct pthread {
struct pthread *self;
struct pthread {
struct pthread *self;
+ void **dtv, *unused1, *unused2;
+ uintptr_t sysinfo;
+ uintptr_t canary;
pid_t tid, pid;
int tsd_used, errno_val, *errno_ptr;
pid_t tid, pid;
int tsd_used, errno_val, *errno_ptr;
- volatile uintptr_t cp_sp, cp_ip;
volatile int cancel, canceldisable, cancelasync;
volatile int cancel, canceldisable, cancelasync;
+ int detached;
unsigned char *map_base;
size_t map_size;
unsigned char *map_base;
size_t map_size;
+ void *stack;
+ size_t stack_size;
void *start_arg;
void *(*start)(void *);
void *result;
void *start_arg;
void *(*start)(void *);
void *result;
- int detached;
- int exitlock;
struct __ptcb *cancelbuf;
void **tsd;
pthread_attr_t attr;
struct __ptcb *cancelbuf;
void **tsd;
pthread_attr_t attr;
@@
-45,7
+40,10
@@
struct pthread {
int unblock_cancel;
int delete_timer;
locale_t locale;
int unblock_cancel;
int delete_timer;
locale_t locale;
- int killlock;
+ int killlock[2];
+ int exitlock[2];
+ int startlock[2];
+ unsigned long sigmask[_NSIG/8/sizeof(long)];
};
struct __timer {
};
struct __timer {
@@
-57,21
+55,33
@@
struct __timer {
#define _a_stacksize __u.__s[0]
#define _a_guardsize __u.__s[1]
#define _a_stacksize __u.__s[0]
#define _a_guardsize __u.__s[1]
-#define _a_detach __u.__i[2*__SU+0]
+#define _a_stackaddr __u.__s[2]
+#define _a_detach __u.__i[3*__SU+0]
+#define _a_sched __u.__i[3*__SU+1]
+#define _a_policy __u.__i[3*__SU+2]
+#define _a_prio __u.__i[3*__SU+3]
#define _m_type __u.__i[0]
#define _m_lock __u.__i[1]
#define _m_waiters __u.__i[2]
#define _m_prev __u.__p[3]
#define _m_next __u.__p[4]
#define _m_count __u.__i[5]
#define _m_type __u.__i[0]
#define _m_lock __u.__i[1]
#define _m_waiters __u.__i[2]
#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 _c_mutex __u.__p[0]
+#define _c_seq __u.__i[2]
+#define _c_waiters __u.__i[3]
+#define _c_clock __u.__i[4]
+#define _c_lock __u.__i[5]
+#define _c_lockwait __u.__i[6]
+#define _c_waiters2 __u.__i[7]
+#define _c_destroy __u.__i[8]
#define _rw_lock __u.__i[0]
#define _rw_waiters __u.__i[1]
#define _rw_lock __u.__i[0]
#define _rw_waiters __u.__i[1]
-#define _b_inst __u.__p[0]
+#define _b_lock __u.__i[0]
+#define _b_waiters __u.__i[1]
#define _b_limit __u.__i[2]
#define _b_limit __u.__i[2]
-#define _b_lock __u.__i[3]
-#define _b_waiters __u.__i[4]
+#define _b_count __u.__i[3]
+#define _b_waiters2 __u.__i[4]
+#define _b_inst __u.__p[3]
#include "pthread_arch.h"
#include "pthread_arch.h"
@@
-79,9
+89,12
@@
struct __timer {
#define SIGCANCEL 33
#define SIGSYNCCALL 34
#define SIGCANCEL 33
#define SIGSYNCCALL 34
-#define SIGPT_SET ((sigset_t *)(unsigned long [1+(sizeof(long)==4)]){ \
+#define SIGALL_SET ((sigset_t *)(const unsigned long long [2]){ -1,-1 })
+#define SIGPT_SET \
+ ((sigset_t *)(const unsigned long [_NSIG/8/sizeof(long)]){ \
[sizeof(long)==4] = 3UL<<(32*(sizeof(long)>4)) })
[sizeof(long)==4] = 3UL<<(32*(sizeof(long)>4)) })
-#define SIGTIMER_SET ((sigset_t *)(unsigned long [1+(sizeof(long)==4)]){ \
+#define SIGTIMER_SET \
+ ((sigset_t *)(const unsigned long [_NSIG/8/sizeof(long)]){ \
0x80000000 })
pthread_t __pthread_self_init(void);
0x80000000 })
pthread_t __pthread_self_init(void);
@@
-95,12
+108,14
@@
void __unmapself(void *, size_t);
int __timedwait(volatile int *, int, clockid_t, const struct timespec *, void (*)(void *), void *, int);
void __wait(volatile int *, volatile int *, int, int);
int __timedwait(volatile int *, int, clockid_t, const struct timespec *, void (*)(void *), void *, int);
void __wait(volatile int *, volatile int *, int, int);
-void __wake(volatile int *, int, int);
+#define __wake(addr, cnt, priv) \
+ __syscall(SYS_futex, addr, FUTEX_WAKE, (cnt)<0?INT_MAX:(cnt))
-void __synccall_lock();
-void __synccall_unlock();
+void __acquire_ptc();
+void __release_ptc();
+void __inhibit_ptc();
-#define DEFAULT_STACK_SIZE
(16384-PAGE_SIZE)
+#define DEFAULT_STACK_SIZE
81920
#define DEFAULT_GUARD_SIZE PAGE_SIZE
#endif
#define DEFAULT_GUARD_SIZE PAGE_SIZE
#endif