diff options
| author | Mike Makonnen <mtm@FreeBSD.org> | 2004-03-29 09:35:07 +0000 |
|---|---|---|
| committer | Mike Makonnen <mtm@FreeBSD.org> | 2004-03-29 09:35:07 +0000 |
| commit | 0c3a942692bfe7e5b0e62f4263f60a82d7a6c120 (patch) | |
| tree | 3f3123f9c8648b0fe6ad20a0837c61ecb2b423de /lib/libthr | |
| parent | ece20938e5c352444e7427c8bb6bc859da68ac0f (diff) | |
Notes
Diffstat (limited to 'lib/libthr')
| -rw-r--r-- | lib/libthr/thread/thr_cond.c | 3 | ||||
| -rw-r--r-- | lib/libthr/thread/thr_mutex.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/lib/libthr/thread/thr_cond.c b/lib/libthr/thread/thr_cond.c index e7e91d9b02b2..9292669d1c03 100644 --- a/lib/libthr/thread/thr_cond.c +++ b/lib/libthr/thread/thr_cond.c @@ -308,10 +308,9 @@ cond_wait_common(pthread_cond_t * cond, pthread_mutex_t * mutex, * before we got a chance to run again. We check for * this by looking to see if our state is RUNNING. */ - if (rval == EAGAIN) { + if (rval == ETIMEDOUT) { if (curthread->state != PS_RUNNING) { PTHREAD_SET_STATE(curthread, PS_RUNNING); - rval = ETIMEDOUT; } else rval = 0; } diff --git a/lib/libthr/thread/thr_mutex.c b/lib/libthr/thread/thr_mutex.c index 75d7323117e1..94c6c257ad28 100644 --- a/lib/libthr/thread/thr_mutex.c +++ b/lib/libthr/thread/thr_mutex.c @@ -905,7 +905,7 @@ get_mcontested(pthread_mutex_t mutexp, const struct timespec *abstime) PANIC("Cannot suspend on mutex."); _SPINLOCK(&mutexp->lock); _thread_critical_enter(curthread); - if (error == EAGAIN) { + if (error == ETIMEDOUT) { /* * Between the timeout and when the mutex was * locked the previous owner may have released |