diff --git a/musl_src.gni b/musl_src.gni index 5530ce9e0f54b0f880922ec408ee8d38a3aaf966..6bd92dd3e21e5c46be86a91e077419d3c7ab781f 100644 --- a/musl_src.gni +++ b/musl_src.gni @@ -2115,6 +2115,7 @@ musl_src_porting_file = [ "src/thread/arm/syscall_cp.s", "src/thread/pthread_mutex_clocklock.c", "src/thread/pthread_mutex_timedlock.c", + "src/thread/pthread_mutex_lock.c", "src/thread/pthread_mutex_timedlock_monotonic_np.c", "src/thread/pthread_mutex_lock_timeout_np.c", "src/thread/pthread_rwlock_clockrdlock.c", diff --git a/porting/linux/user/src/thread/pthread_mutex_lock.c b/porting/linux/user/src/thread/pthread_mutex_lock.c new file mode 100644 index 0000000000000000000000000000000000000000..4049a873335b891db6580f35e07ebd700321b6c5 --- /dev/null +++ b/porting/linux/user/src/thread/pthread_mutex_lock.c @@ -0,0 +1,12 @@ +#include "pthread_impl.h" +extern int __pthread_mutex_timedlock_inner(pthread_mutex_t *restrict m, const struct timespec *restrict at); +int __pthread_mutex_lock(pthread_mutex_t *m) +{ + if ((m->_m_type&15) == PTHREAD_MUTEX_NORMAL + && !a_cas(&m->_m_lock, 0, EBUSY)) + return 0; + + return __pthread_mutex_timedlock_inner(m, 0); +} + +weak_alias(__pthread_mutex_lock, pthread_mutex_lock); diff --git a/porting/linux/user/src/thread/pthread_mutex_timedlock.c b/porting/linux/user/src/thread/pthread_mutex_timedlock.c index d6f2573262271a2dcbd308697e04eebb89debf22..c71f7fc064b277d761975e339f07f60fbc0cf81b 100644 --- a/porting/linux/user/src/thread/pthread_mutex_timedlock.c +++ b/porting/linux/user/src/thread/pthread_mutex_timedlock.c @@ -21,91 +21,96 @@ static int __futex4(volatile void *addr, int op, int val, const struct timespec *to) { #ifdef SYS_futex_time64 - time_t s = to ? to->tv_sec : 0; - long ns = to ? to->tv_nsec : 0; - int r = -ENOSYS; - if (SYS_futex == SYS_futex_time64 || !IS32BIT(s)) - r = __syscall(SYS_futex_time64, addr, op, val, - to ? ((long long[]) {s, ns}) : 0); - if (SYS_futex == SYS_futex_time64 || r!=-ENOSYS) return r; - to = to ? (void *)(long[]) {CLAMP(s), ns} : 0; + time_t s = to ? to->tv_sec : 0; + long ns = to ? to->tv_nsec : 0; + int r = -ENOSYS; + if (SYS_futex == SYS_futex_time64 || !IS32BIT(s)) + r = __syscall(SYS_futex_time64, addr, op, val, + to ? ((long long[]){s, ns}) : 0); + if (SYS_futex == SYS_futex_time64 || r!=-ENOSYS) return r; + to = to ? (void *)(long[]){CLAMP(s), ns} : 0; #endif - return __syscall(SYS_futex, addr, op, val, to); + return __syscall(SYS_futex, addr, op, val, to); } static int pthread_mutex_timedlock_pi(pthread_mutex_t *restrict m, const struct timespec *restrict at) { - int clock = m->_m_clock; - int type = m->_m_type; - int priv = (type & 128) ^ 128; - pthread_t self = __pthread_self(); - int e; + int clock = m->_m_clock; + int type = m->_m_type; + int priv = (type & 128) ^ 128; + pthread_t self = __pthread_self(); + int e; - if (!priv) self->robust_list.pending = &m->_m_next; + if (!priv) self->robust_list.pending = &m->_m_next; - do e = -__futex4(&m->_m_lock, FUTEX_LOCK_PI|priv, 0, at); - while (e==EINTR); - if (e) self->robust_list.pending = 0; + do e = -__futex4(&m->_m_lock, FUTEX_LOCK_PI|priv, 0, at); + while (e==EINTR); + if (e) self->robust_list.pending = 0; - switch (e) { - case 0: - /* Catch spurious success for non-robust mutexes. */ - if (!(type&4) && ((m->_m_lock & 0x40000000) || m->_m_waiters)) { - a_store(&m->_m_waiters, -1); - __syscall(SYS_futex, &m->_m_lock, FUTEX_UNLOCK_PI|priv); - self->robust_list.pending = 0; - break; - } - /* Signal to trylock that we already have the lock. */ - m->_m_count = -1; - return __pthread_mutex_trylock(m); - case ETIMEDOUT: - return e; - case EDEADLK: - if ((type&3) == PTHREAD_MUTEX_ERRORCHECK) return e; - default: - break; - } - do e = __timedwait(&(int) {0}, 0, clock, at, 1); - while (e != ETIMEDOUT); - return e; + switch (e) { + case 0: + /* Catch spurious success for non-robust mutexes. */ + if (!(type&4) && ((m->_m_lock & 0x40000000) || m->_m_waiters)) { + a_store(&m->_m_waiters, -1); + __syscall(SYS_futex, &m->_m_lock, FUTEX_UNLOCK_PI|priv); + self->robust_list.pending = 0; + break; + } + /* Signal to trylock that we already have the lock. */ + m->_m_count = -1; + return __pthread_mutex_trylock_owner(m); + case ETIMEDOUT: + return e; + case EDEADLK: + if ((type&3) == PTHREAD_MUTEX_ERRORCHECK) return e; + } + do e = __timedwait(&(int){0}, 0, clock, at, 1); + while (e != ETIMEDOUT); + return e; } -int __pthread_mutex_timedlock(pthread_mutex_t *restrict m, const struct timespec *restrict at) +int __pthread_mutex_timedlock_inner(pthread_mutex_t *restrict m, const struct timespec *restrict at) { - if ((m->_m_type&15) == PTHREAD_MUTEX_NORMAL - && !a_cas(&m->_m_lock, 0, EBUSY)) - return 0; - - int clock = (m->_m_clock == CLOCK_MONOTONIC) ? CLOCK_MONOTONIC : CLOCK_REALTIME; - int type = m->_m_type; - int r, t, priv = (type & 128) ^ 128; - - r = __pthread_mutex_trylock(m); - if (r != EBUSY) return r; - - if (type&8) return pthread_mutex_timedlock_pi(m, at); + int type = m->_m_type; + int r; + // PI + if (type&8) { + r = __pthread_mutex_trylock_owner(m); + if (r != EBUSY) return r; + return pthread_mutex_timedlock_pi(m, at); + } + r = __pthread_mutex_trylock(m); + if (r != EBUSY) return r; + int clock = (m->_m_clock == CLOCK_MONOTONIC) ? CLOCK_MONOTONIC : CLOCK_REALTIME; + int t, priv = (type & 128) ^ 128; + int spins = 100; + while (spins-- && m->_m_lock && !m->_m_waiters) a_spin(); - int spins = 100; - while (spins-- && m->_m_lock && !m->_m_waiters) a_spin(); + while ((r=__pthread_mutex_trylock(m)) == EBUSY) { + r = m->_m_lock; + int own = r & 0x3fffffff; + if (!own && (!r || (type&4))) + continue; + if ((type&3) == PTHREAD_MUTEX_ERRORCHECK + && own == __pthread_self()->tid) + return EDEADLK; - while ((r=__pthread_mutex_trylock(m)) == EBUSY) { - r = m->_m_lock; - int own = r & 0x3fffffff; - if (!own && (!r || (type&4))) - continue; - if ((type&3) == PTHREAD_MUTEX_ERRORCHECK - && own == __pthread_self()->tid) - return EDEADLK; + a_inc(&m->_m_waiters); + t = r | 0x80000000; + a_cas(&m->_m_lock, r, t); + r = __timedwait(&m->_m_lock, t, clock, at, priv); + a_dec(&m->_m_waiters); + if (r && r != EINTR) break; + } + return r; +} - a_inc(&m->_m_waiters); - t = r | 0x80000000; - a_cas(&m->_m_lock, r, t); - r = __timedwait(&m->_m_lock, t, clock, at, priv); - a_dec(&m->_m_waiters); - if (r && r != EINTR) break; - } - return r; +int __pthread_mutex_timedlock(pthread_mutex_t *restrict m, const struct timespec *restrict at) +{ + if ((m->_m_type&15) == PTHREAD_MUTEX_NORMAL + && !a_cas(&m->_m_lock, 0, EBUSY)) + return 0; + return __pthread_mutex_timedlock_inner(m, at); } weak_alias(__pthread_mutex_timedlock, pthread_mutex_timedlock); \ No newline at end of file