diff options
| author |   pvalchev <pvalchev@openbsd.org> | 2002-05-07 05:17:15 +0000 |
|---|---|---|
| committer | pvalchev <pvalchev@openbsd.org> | 2002-05-07 05:17:15 +0000 |
| commit | ab852ae07ece3c1bc7ce70768c284abd80ccb882 (patch) | |
| tree | 3d5cda4ec00143a37219e64fc94dc17f3ea8cbc4 | |
| parent | Make sure calls to pthread_cancel() do not take effect if the target (diff) | |
| download | wireguard-openbsd-ab852ae07ece3c1bc7ce70768c284abd80ccb882.tar.xz wireguard-openbsd-ab852ae07ece3c1bc7ce70768c284abd80ccb882.zip | |
return EBUSY, not EWOULDBLOCK for error when calling thread would block
for pthread_rwlock_wrlock & sie says Single Unix Specification; ok fgs
| -rw-r--r-- | lib/libc_r/uthread/uthread_rwlock.c | 6 | ||||
| -rw-r--r-- | lib/libpthread/uthread/uthread_rwlock.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/libc_r/uthread/uthread_rwlock.c b/lib/libc_r/uthread/uthread_rwlock.c index 259f1898402..144bd5ab826 100644 --- a/lib/libc_r/uthread/uthread_rwlock.c +++ b/lib/libc_r/uthread/uthread_rwlock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uthread_rwlock.c,v 1.3 1999/11/25 07:01:42 d Exp $ */ +/* $OpenBSD: uthread_rwlock.c,v 1.4 2002/05/07 05:17:15 pvalchev Exp $ */ /*- * Copyright (c) 1998 Alex Nash * All rights reserved. @@ -203,7 +203,7 @@ pthread_rwlock_tryrdlock (pthread_rwlock_t *rwlock) /* give writers priority over readers */ if (prwlock->blocked_writers || prwlock->state < 0) - ret = EWOULDBLOCK; + ret = EBUSY; else if (prwlock->state == MAX_READ_LOCKS) ret = EAGAIN; /* too many read locks acquired */ else @@ -239,7 +239,7 @@ pthread_rwlock_trywrlock (pthread_rwlock_t *rwlock) return(ret); if (prwlock->state != 0) - ret = EWOULDBLOCK; + ret = EBUSY; else /* indicate we are locked for writing */ prwlock->state = -1; diff --git a/lib/libpthread/uthread/uthread_rwlock.c b/lib/libpthread/uthread/uthread_rwlock.c index 259f1898402..144bd5ab826 100644 --- a/lib/libpthread/uthread/uthread_rwlock.c +++ b/lib/libpthread/uthread/uthread_rwlock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uthread_rwlock.c,v 1.3 1999/11/25 07:01:42 d Exp $ */ +/* $OpenBSD: uthread_rwlock.c,v 1.4 2002/05/07 05:17:15 pvalchev Exp $ */ /*- * Copyright (c) 1998 Alex Nash * All rights reserved. @@ -203,7 +203,7 @@ pthread_rwlock_tryrdlock (pthread_rwlock_t *rwlock) /* give writers priority over readers */ if (prwlock->blocked_writers || prwlock->state < 0) - ret = EWOULDBLOCK; + ret = EBUSY; else if (prwlock->state == MAX_READ_LOCKS) ret = EAGAIN; /* too many read locks acquired */ else @@ -239,7 +239,7 @@ pthread_rwlock_trywrlock (pthread_rwlock_t *rwlock) return(ret); if (prwlock->state != 0) - ret = EWOULDBLOCK; + ret = EBUSY; else /* indicate we are locked for writing */ prwlock->state = -1; |