| Index: fusl/src/thread/pthread_rwlock_timedwrlock.c
|
| diff --git a/fusl/src/thread/pthread_rwlock_timedwrlock.c b/fusl/src/thread/pthread_rwlock_timedwrlock.c
|
| index 7f26dad1f5915e8cf5f81f6a39e9695a071d5005..cf4d432f02f5b6d03e9214f1557e651b2b2a932c 100644
|
| --- a/fusl/src/thread/pthread_rwlock_timedwrlock.c
|
| +++ b/fusl/src/thread/pthread_rwlock_timedwrlock.c
|
| @@ -1,23 +1,27 @@
|
| #include "pthread_impl.h"
|
|
|
| -int pthread_rwlock_timedwrlock(pthread_rwlock_t *restrict rw, const struct timespec *restrict at)
|
| -{
|
| - int r, t;
|
| -
|
| - r = pthread_rwlock_trywrlock(rw);
|
| - if (r != EBUSY) return r;
|
| -
|
| - int spins = 100;
|
| - while (spins-- && rw->_rw_lock && !rw->_rw_waiters) a_spin();
|
| +int pthread_rwlock_timedwrlock(pthread_rwlock_t* restrict rw,
|
| + const struct timespec* restrict at) {
|
| + int r, t;
|
|
|
| - while ((r=pthread_rwlock_trywrlock(rw))==EBUSY) {
|
| - if (!(r=rw->_rw_lock)) continue;
|
| - t = r | 0x80000000;
|
| - a_inc(&rw->_rw_waiters);
|
| - a_cas(&rw->_rw_lock, r, t);
|
| - r = __timedwait(&rw->_rw_lock, t, CLOCK_REALTIME, at, rw->_rw_shared^128);
|
| - a_dec(&rw->_rw_waiters);
|
| - if (r && r != EINTR) return r;
|
| - }
|
| - return r;
|
| + r = pthread_rwlock_trywrlock(rw);
|
| + if (r != EBUSY)
|
| + return r;
|
| +
|
| + int spins = 100;
|
| + while (spins-- && rw->_rw_lock && !rw->_rw_waiters)
|
| + a_spin();
|
| +
|
| + while ((r = pthread_rwlock_trywrlock(rw)) == EBUSY) {
|
| + if (!(r = rw->_rw_lock))
|
| + continue;
|
| + t = r | 0x80000000;
|
| + a_inc(&rw->_rw_waiters);
|
| + a_cas(&rw->_rw_lock, r, t);
|
| + r = __timedwait(&rw->_rw_lock, t, CLOCK_REALTIME, at, rw->_rw_shared ^ 128);
|
| + a_dec(&rw->_rw_waiters);
|
| + if (r && r != EINTR)
|
| + return r;
|
| + }
|
| + return r;
|
| }
|
|
|