projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
another return value fix for mktemp...
[musl]
/
src
/
internal
/
pthread_impl.h
diff --git
a/src/internal/pthread_impl.h
b/src/internal/pthread_impl.h
index
c8fa4b1
..
219bf00
100644
(file)
--- a/
src/internal/pthread_impl.h
+++ b/
src/internal/pthread_impl.h
@@
-12,6
+12,7
@@
#include <setjmp.h>
#include <string.h>
#include <time.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,7
+25,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;
@@
-41,6
+43,14
@@
struct pthread {
long off;
void *pending;
} robust_list;
long off;
void *pending;
} robust_list;
+ int unblock_cancel;
+ int delete_timer;
+ locale_t locale;
+};
+
+struct __timer {
+ int timerid;
+ pthread_t thread;
};
#define __SU (sizeof(size_t)/sizeof(int))
};
#define __SU (sizeof(size_t)/sizeof(int))
@@
-60,16
+70,21
@@
struct pthread {
#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"
#include "pthread_arch.h"
-#define SIGCANCEL 32
-#define SIGSYSCALL 33
-#define SIGTIMER 32 /* ?? */
+#define SIGTIMER 32
+#define SIGCANCEL 33
+#define SIGSYSCALL 34
+
+#define SIGPT_SET ((sigset_t *)(unsigned long [1+(sizeof(long)==4)]){ \
+ [sizeof(long)==4] = 3<<(32*(sizeof(long)>4)) })
+#define SIGTIMER_SET ((sigset_t *)(unsigned long [1+(sizeof(long)==4)]){ \
+ 0x80000000 })
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 *);
@@
-78,9
+93,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