getservbyport_r: fix wrong result if getnameinfo fails with EAI_OVERFLOW

[musl] / src / thread / pthread_rwlock_timedwrlock.c

diff --git a/src/thread/pthread_rwlock_timedwrlock.c b/src/thread/pthread_rwlock_timedwrlock.c
index f02b174..d77706e 100644 (file)
--- a/src/thread/pthread_rwlock_timedwrlock.c
+++ b/src/thread/pthread_rwlock_timedwrlock.c
@@ -1,6 +1,6 @@
 #include "pthread_impl.h"
 
-int pthread_rwlock_timedwrlock(pthread_rwlock_t *restrict rw, const struct timespec *restrict at)
+int __pthread_rwlock_timedwrlock(pthread_rwlock_t *restrict rw, const struct timespec *restrict at)
 {
        int r, t;
        
@@ -8,16 +8,18 @@ int pthread_rwlock_timedwrlock(pthread_rwlock_t *restrict rw, const struct times
        if (r != EBUSY) return r;
        
        int spins = 100;
-       while (spins-- && rw->_rw_lock) a_spin();
+       while (spins-- && rw->_rw_lock && !rw->_rw_waiters) a_spin();
 
-       while ((r=pthread_rwlock_trywrlock(rw))==EBUSY) {
+       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, 0, 0, rw->_rw_shared^128);
+               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;
 }
+
+weak_alias(__pthread_rwlock_timedwrlock, pthread_rwlock_timedwrlock);