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
848ff66
..
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;
struct pthread *self;
void **dtv, *unused1, *unused2;
uintptr_t sysinfo;
- uintptr_t canary;
+ uintptr_t canary
, canary2
;
pid_t tid, pid;
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;
@@
-38,12
+41,21
@@
struct pthread {
volatile void *volatile pending;
} robust_list;
int unblock_cancel;
volatile void *volatile pending;
} robust_list;
int unblock_cancel;
- int timer_id;
+
volatile
int timer_id;
locale_t locale;
locale_t locale;
-
int killlock[2
];
-
int exitlock[2
];
- int startlock[2];
+
volatile int killlock[1
];
+
volatile int exitlock[1
];
+
volatile
int startlock[2];
unsigned long sigmask[_NSIG/8/sizeof(long)];
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;
};
struct __timer {
};
struct __timer {
@@
-61,31
+73,42
@@
struct __timer {
#define _a_policy __u.__i[3*__SU+2]
#define _a_prio __u.__i[3*__SU+3]
#define _m_type __u.__i[0]
#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_lock __u.__
v
i[1]
+#define _m_waiters __u.__
v
i[2]
#define _m_prev __u.__p[3]
#define _m_next __u.__p[4]
#define _m_count __u.__i[5]
#define _m_prev __u.__p[3]
#define _m_next __u.__p[4]
#define _m_count __u.__i[5]
-#define _c_
mutex
__u.__p[0]
-#define _c_seq __u.__i[2]
-#define _c_waiters __u.__i[3]
+#define _c_
shared
__u.__p[0]
+#define _c_seq __u.__
v
i[2]
+#define _c_waiters __u.__
v
i[3]
#define _c_clock __u.__i[4]
#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 _c_lock __u.__vi[8]
+#define _c_head __u.__p[1]
+#define _c_tail __u.__p[5]
+#define _rw_lock __u.__vi[0]
+#define _rw_waiters __u.__vi[1]
#define _rw_shared __u.__i[2]
#define _rw_shared __u.__i[2]
-#define _b_lock __u.__i[0]
-#define _b_waiters __u.__i[1]
+#define _b_lock __u.__
v
i[0]
+#define _b_waiters __u.__
v
i[1]
#define _b_limit __u.__i[2]
#define _b_limit __u.__i[2]
-#define _b_count __u.__i[3]
-#define _b_waiters2 __u.__i[4]
+#define _b_count __u.__
v
i[3]
+#define _b_waiters2 __u.__
v
i[4]
#define _b_inst __u.__p[3]
#include "pthread_arch.h"
#define _b_inst __u.__p[3]
#include "pthread_arch.h"
+#ifndef CANARY
+#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
@@
-107,25
+130,38
@@
int __libc_sigprocmask(int, const sigset_t *, sigset_t *);
void __lock(volatile int *);
void __unmapself(void *, size_t);
void __lock(volatile int *);
void __unmapself(void *, size_t);
-int __timedwait(volatile int *, int, clockid_t, const struct timespec *, void (*)(void *), void *, int);
+void __vm_wait(void);
+void __vm_lock(void);
+void __vm_unlock(void);
+
+int __timedwait(volatile int *, int, clockid_t, const struct timespec *, int);
+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;
if (cnt<0) cnt = INT_MAX;
- __syscall(SYS_futex, addr, FUTEX_WAKE|priv, cnt) != -E
INVAL
||
+ __syscall(SYS_futex, addr, FUTEX_WAKE|priv, cnt) != -E
NOSYS
||
__syscall(SYS_futex, addr, FUTEX_WAKE, cnt);
}
__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 __release_ptc();
-void __inhibit_ptc();
+void __acquire_ptc(
void
);
+void __release_ptc(
void
);
+void __inhibit_ptc(
void
);
void __block_all_sigs(void *);
void __block_app_sigs(void *);
void __restore_sigs(void *);
#define DEFAULT_STACK_SIZE 81920
void __block_all_sigs(void *);
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)
#endif
#endif