projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cleanup use of visibility attributes in pthread_cancel.c
[musl]
/
src
/
thread
/
sem_timedwait.c
diff --git
a/src/thread/sem_timedwait.c
b/src/thread/sem_timedwait.c
index
1d4b3e2
..
8132eb1
100644
(file)
--- a/
src/thread/sem_timedwait.c
+++ b/
src/thread/sem_timedwait.c
@@
-6,20
+6,23
@@
static void cleanup(void *p)
a_dec(p);
}
a_dec(p);
}
-int sem_timedwait(sem_t *
sem, const struct timespec *
at)
+int sem_timedwait(sem_t *
restrict sem, const struct timespec *restrict
at)
{
{
+ pthread_testcancel();
+
+ if (!sem_trywait(sem)) return 0;
+
+ int spins = 100;
+ while (spins-- && sem->__val[0] <= 0 && !sem->__val[1]) a_spin();
+
while (sem_trywait(sem)) {
int r;
while (sem_trywait(sem)) {
int r;
- if (at && at->tv_nsec >= 1000000000UL) {
- errno = EINVAL;
- return -1;
- }
a_inc(sem->__val+1);
a_cas(sem->__val, 0, -1);
a_inc(sem->__val+1);
a_cas(sem->__val, 0, -1);
- pthread_cleanup_push(cleanup,
sem->__val+1
);
- r = __timedwait_cp(sem->__val, -1, CLOCK_REALTIME, at,
0
);
+ pthread_cleanup_push(cleanup,
(void *)(sem->__val+1)
);
+ r = __timedwait_cp(sem->__val, -1, CLOCK_REALTIME, at,
sem->__val[2]
);
pthread_cleanup_pop(1);
pthread_cleanup_pop(1);
- if (r) {
+ if (r
&& r != EINTR
) {
errno = r;
return -1;
}
errno = r;
return -1;
}