diff options
| author |   tedu <tedu@openbsd.org> | 2005-12-13 17:22:46 +0000 |
|---|---|---|
| committer | tedu <tedu@openbsd.org> | 2005-12-13 17:22:46 +0000 |
| commit | 6211553ed14aa7f13dc232b427f745a37dc84d5e (patch) | |
| tree | 98cddd17419a360e43a143fb6959c41fdb9f0a32 /lib/librthread/rthread_sync.c | |
| parent | Prevent recursive interrupts. Solves kernel stack overflow on i386 under (diff) | |
| download | wireguard-openbsd-6211553ed14aa7f13dc232b427f745a37dc84d5e.tar.xz wireguard-openbsd-6211553ed14aa7f13dc232b427f745a37dc84d5e.zip | |
make the mutex unlock and sleep in pthread_cond_wait properly atomic
Diffstat (limited to 'lib/librthread/rthread_sync.c')
| -rw-r--r-- | lib/librthread/rthread_sync.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/lib/librthread/rthread_sync.c b/lib/librthread/rthread_sync.c index d0afd85ce3b..9911c370c1d 100644 --- a/lib/librthread/rthread_sync.c +++ b/lib/librthread/rthread_sync.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rthread_sync.c,v 1.6 2005/12/13 07:04:34 tedu Exp $ */ +/* $OpenBSD: rthread_sync.c,v 1.7 2005/12/13 17:22:46 tedu Exp $ */ /* * Copyright (c) 2004 Ted Unangst <tedu@openbsd.org> * All Rights Reserved. @@ -47,9 +47,16 @@ int thrwakeup(void *); int _sem_wait(sem_t sem, int tryonly, int timo) { - int do_sleep; _spinlock(&sem->lock); + return (_sem_waitl(sem, tryonly, timo)); +} + +int +_sem_waitl(sem_t sem, int tryonly, int timo) +{ + int do_sleep; + again: if (sem->value == 0) { if (tryonly) { @@ -361,8 +368,9 @@ pthread_cond_timedwait(pthread_cond_t *condp, pthread_mutex_t *mutexp, if ((error = pthread_cond_init(condp, NULL))) return (error); + _spinlock(&(*condp)->sem.lock); pthread_mutex_unlock(mutexp); - rv = _sem_wait(&(*condp)->sem, 0, (abstime ? + rv = _sem_waitl(&(*condp)->sem, 0, (abstime ? abstime->tv_sec * 1000 + abstime->tv_nsec / 1000000 : 0)); error = pthread_mutex_lock(mutexp); |