projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
minimal realpath implementation using /proc
[musl]
/
src
/
internal
/
pthread_impl.h
diff --git
a/src/internal/pthread_impl.h
b/src/internal/pthread_impl.h
index
adb80f2
..
304bf98
100644
(file)
--- a/
src/internal/pthread_impl.h
+++ b/
src/internal/pthread_impl.h
@@
-24,18
+24,31
@@
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;
void *(*start)(void *);
void *result;
unsigned char *map_base;
size_t map_size;
void *start_arg;
void *(*start)(void *);
void *result;
- jmp_buf exit_jmp_buf;
int detached;
int exitlock;
struct __ptcb *cancelbuf;
void **tsd;
pthread_attr_t attr;
int detached;
int exitlock;
struct __ptcb *cancelbuf;
void **tsd;
pthread_attr_t attr;
+ volatile int dead;
+ struct {
+ void **head;
+ long off;
+ void *pending;
+ } robust_list;
+ int unblock_cancel;
+ int delete_timer;
+};
+
+struct __timer {
+ int timerid;
+ pthread_t thread;
};
#define __SU (sizeof(size_t)/sizeof(int))
};
#define __SU (sizeof(size_t)/sizeof(int))
@@
-46,8
+59,9
@@
struct pthread {
#define _m_type __u.__i[0]
#define _m_lock __u.__i[1]
#define _m_waiters __u.__i[2]
#define _m_type __u.__i[0]
#define _m_lock __u.__i[1]
#define _m_waiters __u.__i[2]
-#define _m_owner __u.__i[3]
-#define _m_count __u.__i[4]
+#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 _rw_wrlock __u.__i[0]
#define _c_block __u.__i[0]
#define _c_clock __u.__i[1]
#define _rw_wrlock __u.__i[0]
@@
-63,7
+77,7
@@
struct pthread {
#define SIGCANCEL 32
#define SIGSYSCALL 33
#define SIGCANCEL 32
#define SIGSYSCALL 33
-#define SIGTIMER
32 /* ?? */
+#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 *);
@@
-72,9
+86,13
@@
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);
+void __rsyscall_lock();
+void __rsyscall_unlock();
+
#define DEFAULT_STACK_SIZE (16384-PAGE_SIZE)
#define DEFAULT_GUARD_SIZE PAGE_SIZE
#define DEFAULT_STACK_SIZE (16384-PAGE_SIZE)
#define DEFAULT_GUARD_SIZE PAGE_SIZE