projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
completely new barrier implementation, addressing major correctness issues
[musl]
/
src
/
internal
/
pthread_impl.h
diff --git
a/src/internal/pthread_impl.h
b/src/internal/pthread_impl.h
index
3e436ae
..
049f5df
100644
(file)
--- a/
src/internal/pthread_impl.h
+++ b/
src/internal/pthread_impl.h
@@
-24,7
+24,8
@@
struct pthread {
unsigned long tlsdesc[4];
pid_t tid, pid;
int tsd_used, errno_val, *errno_ptr;
unsigned long tlsdesc[4];
pid_t tid, pid;
int tsd_used, errno_val, *errno_ptr;
- volatile int canceldisable, cancelasync, cancelpoint, cancel;
+ volatile uintptr_t cp_sp, cp_ip;
+ volatile int cancel, canceldisable, cancelasync;
unsigned char *map_base;
size_t map_size;
void *start_arg;
unsigned char *map_base;
size_t map_size;
void *start_arg;
@@
-67,15
+68,16
@@
struct __timer {
#define _rw_readers __u.__i[1]
#define _rw_waiters __u.__i[2]
#define _rw_owner __u.__i[3]
#define _rw_readers __u.__i[1]
#define _rw_waiters __u.__i[2]
#define _rw_owner __u.__i[3]
-#define _b_
count __u.__i
[0]
-#define _b_limit __u.__i[
1
]
-#define _b_l
eft __u.__i[2
]
-#define _b_waiters __u.__i[
3
]
+#define _b_
inst __u.__p
[0]
+#define _b_limit __u.__i[
2
]
+#define _b_l
ock __u.__i[3
]
+#define _b_waiters __u.__i[
4
]
#include "pthread_arch.h"
#define SIGCANCEL 32
#define SIGSYSCALL 33
#include "pthread_arch.h"
#define SIGCANCEL 32
#define SIGSYSCALL 33
+#define SIGTIMER 34
int __set_thread_area(void *);
int __libc_sigaction(int, const struct sigaction *, struct sigaction *);
int __set_thread_area(void *);
int __libc_sigaction(int, const struct sigaction *, struct sigaction *);
@@
-84,6
+86,7
@@
void __lock(volatile int *);
void __unmapself(void *, size_t);
int __timedwait(volatile int *, int, clockid_t, const struct timespec *, int);
void __unmapself(void *, size_t);
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 __wake(volatile int *, int, int);
void __wait(volatile int *, volatile int *, int, int);
void __wake(volatile int *, int, int);