summaryrefslogtreecommitdiffstats
path: root/sys/kern/kern_umtx.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/kern/kern_umtx.c')
-rw-r--r--sys/kern/kern_umtx.c35
1 files changed, 12 insertions, 23 deletions
diff --git a/sys/kern/kern_umtx.c b/sys/kern/kern_umtx.c
index 42d2761..bdae3e8 100644
--- a/sys/kern/kern_umtx.c
+++ b/sys/kern/kern_umtx.c
@@ -1059,8 +1059,10 @@ do_wait(struct thread *td, void *addr, u_long id,
umtxq_lock(&uq->uq_key);
for (;;) {
error = umtxq_sleep(uq, "uwait", tvtohz(&tv));
- if (!(uq->uq_flags & UQF_UMTXQ))
+ if (!(uq->uq_flags & UQF_UMTXQ)) {
+ error = 0;
break;
+ }
if (error != ETIMEDOUT)
break;
umtxq_unlock(&uq->uq_key);
@@ -2404,25 +2406,14 @@ do_cv_wait(struct thread *td, struct ucond *cv, struct umutex *m,
}
}
- if (error != 0) {
- if ((uq->uq_flags & UQF_UMTXQ) == 0) {
- /*
- * If we concurrently got do_cv_signal()d
- * and we got an error or UNIX signals or a timeout,
- * then, perform another umtxq_signal to avoid
- * consuming the wakeup. This may cause supurious
- * wakeup for another thread which was just queued,
- * but SUSV3 explicitly allows supurious wakeup to
- * occur, and indeed a kernel based implementation
- * can not avoid it.
- */
- if (!umtxq_signal(&uq->uq_key, 1))
- error = 0;
- }
+ if ((uq->uq_flags & UQF_UMTXQ) == 0)
+ error = 0;
+ else {
+ umtxq_remove(uq);
if (error == ERESTART)
error = EINTR;
}
- umtxq_remove(uq);
+
umtxq_unlock(&uq->uq_key);
umtx_key_release(&uq->uq_key);
return (error);
@@ -2891,15 +2882,13 @@ do_sem_wait(struct thread *td, struct _usem *sem, struct timespec *timeout)
}
}
- if (error != 0) {
- if ((uq->uq_flags & UQF_UMTXQ) == 0) {
- if (!umtxq_signal(&uq->uq_key, 1))
- error = 0;
- }
+ if ((uq->uq_flags & UQF_UMTXQ) == 0)
+ error = 0;
+ else {
+ umtxq_remove(uq);
if (error == ERESTART)
error = EINTR;
}
- umtxq_remove(uq);
umtxq_unlock(&uq->uq_key);
umtx_key_release(&uq->uq_key);
return (error);
OpenPOWER on IntegriCloud