projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
malloc: fix an over-allocation bug
[musl]
/
src
/
internal
/
pthread_impl.h
diff --git
a/src/internal/pthread_impl.h
b/src/internal/pthread_impl.h
index
e29f9c8
..
f6a4f2c
100644
(file)
--- a/
src/internal/pthread_impl.h
+++ b/
src/internal/pthread_impl.h
@@
-13,11
+13,15
@@
#define pthread __pthread
struct pthread {
#define pthread __pthread
struct pthread {
+ /* Part 1 -- these fields may be external or
+ * internal (accessed via asm) ABI. Do not change. */
struct pthread *self;
void **dtv, *unused1, *unused2;
uintptr_t sysinfo;
uintptr_t canary, canary2;
pid_t tid, pid;
struct pthread *self;
void **dtv, *unused1, *unused2;
uintptr_t sysinfo;
uintptr_t canary, canary2;
pid_t tid, pid;
+
+ /* Part 2 -- implementation details, non-ABI. */
int tsd_used, errno_val;
volatile int cancel, canceldisable, cancelasync;
int detached;
int tsd_used, errno_val;
volatile int cancel, canceldisable, cancelasync;
int detached;
@@
-30,7
+34,6
@@
struct pthread {
void *result;
struct __ptcb *cancelbuf;
void **tsd;
void *result;
struct __ptcb *cancelbuf;
void **tsd;
- pthread_attr_t attr;
volatile int dead;
struct {
volatile void *volatile head;
volatile int dead;
struct {
volatile void *volatile head;
@@
-40,13
+43,17
@@
struct pthread {
int unblock_cancel;
volatile int timer_id;
locale_t locale;
int unblock_cancel;
volatile int timer_id;
locale_t locale;
- volatile int killlock[
2
];
- volatile int exitlock[
2
];
+ volatile int killlock[
1
];
+ volatile int exitlock[
1
];
volatile int startlock[2];
unsigned long sigmask[_NSIG/8/sizeof(long)];
char *dlerror_buf;
int dlerror_flag;
void *stdio_locks;
volatile int startlock[2];
unsigned long sigmask[_NSIG/8/sizeof(long)];
char *dlerror_buf;
int dlerror_flag;
void *stdio_locks;
+ size_t guard_size;
+
+ /* Part 3 -- the positions of these fields relative to
+ * the end of the structure is external and internal ABI. */
uintptr_t canary_at_end;
void **dtv_copy;
};
uintptr_t canary_at_end;
void **dtv_copy;
};
@@
-94,6
+101,14
@@
struct __timer {
#define CANARY canary
#endif
#define CANARY canary
#endif
+#ifndef DTP_OFFSET
+#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
#define SIGTIMER 32
#define SIGCANCEL 33
#define SIGSYNCCALL 34
@@
-124,11
+139,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)
{
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);
}
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);
void __acquire_ptc(void);
void __release_ptc(void);
@@
-139,7
+160,7
@@
void __block_app_sigs(void *);
void __restore_sigs(void *);
#define DEFAULT_STACK_SIZE 81920
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)
#define __ATTRP_C11_THREAD ((void*)(uintptr_t)-1)