d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the return code from pthread_rwlock_try[rw|rd]lock() functions;

Browse Source 
these should return EBUSY when the calling thread would block.

MFC after: 2 weeks
This commit is contained in:
Brian S. Dean 2002-03-15 18:27:58 +00:00
parent f303d23186
commit b18ae9245d
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/libc_r/uthread/uthread_rwlock.c
View File

@ -209,7 +209,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
@ -245,7 +245,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;

4
lib/libkse/thread/thr_rwlock.c
View File

@ -209,7 +209,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
@ -245,7 +245,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;

4
lib/libpthread/thread/thr_rwlock.c
View File

@ -209,7 +209,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
@ -245,7 +245,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;