projects
/
oweals
/
musl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix erroneous stop before input limit in mbsnrtowcs and wcsnrtombs
[oweals/musl.git]
/
src
/
internal
/
pthread_impl.h
diff --git
a/src/internal/pthread_impl.h
b/src/internal/pthread_impl.h
index 0f10cc48b116ff026fb59bf4dfd13deb0189deb3..56e19348ece8fcb8152e4ad10410eb91b35a176b 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"
@@
-24,30
+16,38
@@
struct pthread {
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;
- int tsd_used, errno_val
, *errno_ptr
;
+ int tsd_used, errno_val;
volatile int cancel, canceldisable, cancelasync;
int detached;
unsigned char *map_base;
size_t map_size;
volatile int cancel, canceldisable, cancelasync;
int detached;
unsigned char *map_base;
size_t map_size;
+ void *stack;
+ size_t stack_size;
void *start_arg;
void *(*start)(void *);
void *result;
struct __ptcb *cancelbuf;
void **tsd;
void *start_arg;
void *(*start)(void *);
void *result;
struct __ptcb *cancelbuf;
void **tsd;
- pthread_attr_t attr;
volatile int dead;
struct {
volatile int dead;
struct {
- vo
id **
head;
+ vo
latile void *volatile
head;
long off;
long off;
- vo
id *
pending;
+ vo
latile void *volatile
pending;
} robust_list;
int unblock_cancel;
} robust_list;
int unblock_cancel;
-
int delete_timer
;
+
volatile int timer_id
;
locale_t locale;
locale_t locale;
- int killlock[2];
- int exitlock[2];
+ volatile int killlock[2];
+ volatile int exitlock[2];
+ volatile int startlock[2];
+ unsigned long sigmask[_NSIG/8/sizeof(long)];
+ char *dlerror_buf;
+ int dlerror_flag;
+ void *stdio_locks;
+ uintptr_t canary_at_end;
+ void **dtv_copy;
};
struct __timer {
};
struct __timer {
@@
-61,41
+61,56
@@
struct __timer {
#define _a_guardsize __u.__s[1]
#define _a_stackaddr __u.__s[2]
#define _a_detach __u.__i[3*__SU+0]
#define _a_guardsize __u.__s[1]
#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_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 _b_lock __u.__i[0]
-#define _b_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 _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 SIGALL_SET ((sigset_t *)(const unsigned long long [2]){ -1,-1 })
#define SIGPT_SET \
#define SIGTIMER 32
#define SIGCANCEL 33
#define SIGSYNCCALL 34
#define SIGALL_SET ((sigset_t *)(const unsigned long long [2]){ -1,-1 })
#define SIGPT_SET \
- ((sigset_t *)(const unsigned long [_
_SYSCALL_SSLEN
/sizeof(long)]){ \
+ ((sigset_t *)(const unsigned long [_
NSIG/8
/sizeof(long)]){ \
[sizeof(long)==4] = 3UL<<(32*(sizeof(long)>4)) })
#define SIGTIMER_SET \
[sizeof(long)==4] = 3UL<<(32*(sizeof(long)>4)) })
#define SIGTIMER_SET \
- ((sigset_t *)(const unsigned long [_
_SYSCALL_SSLEN
/sizeof(long)]){ \
+ ((sigset_t *)(const unsigned long [_
NSIG/8
/sizeof(long)]){ \
0x80000000 })
pthread_t __pthread_self_init(void);
0x80000000 })
pthread_t __pthread_self_init(void);
@@
-107,15
+122,32
@@
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);
void __wait(volatile int *, volatile int *, int, int);
-void __wake(volatile int *, int, int);
+static inline void __wake(volatile void *addr, int cnt, int priv)
+{
+ 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);
+}
-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
#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