mirror of
https://sourceware.org/git/glibc.git
synced 2025-10-30 10:45:40 +03:00
cc25c8b4c1
This replaces the pthread rwlock with a new implementation that uses a more scalable algorithm (primarily through not using a critical section anymore to make state changes). The fast path for rdlock acquisition and release is now basically a single atomic read-modify write or CAS and a few branches. See nptl/pthread_rwlock_common.c for details. * nptl/DESIGN-rwlock.txt: Remove. * nptl/lowlevelrwlock.sym: Remove. * nptl/Makefile: Add new tests. * nptl/pthread_rwlock_common.c: New file. Contains the new rwlock. * nptl/pthreadP.h (PTHREAD_RWLOCK_PREFER_READER_P): Remove. (PTHREAD_RWLOCK_WRPHASE, PTHREAD_RWLOCK_WRLOCKED, PTHREAD_RWLOCK_RWAITING, PTHREAD_RWLOCK_READER_SHIFT, PTHREAD_RWLOCK_READER_OVERFLOW, PTHREAD_RWLOCK_WRHANDOVER, PTHREAD_RWLOCK_FUTEX_USED): New. * nptl/pthread_rwlock_init.c (__pthread_rwlock_init): Adapt to new implementation. * nptl/pthread_rwlock_rdlock.c (__pthread_rwlock_rdlock_slow): Remove. (__pthread_rwlock_rdlock): Adapt. * nptl/pthread_rwlock_timedrdlock.c (pthread_rwlock_timedrdlock): Adapt. * nptl/pthread_rwlock_timedwrlock.c (pthread_rwlock_timedwrlock): Adapt. * nptl/pthread_rwlock_trywrlock.c (pthread_rwlock_trywrlock): Adapt. * nptl/pthread_rwlock_tryrdlock.c (pthread_rwlock_tryrdlock): Adapt. * nptl/pthread_rwlock_unlock.c (pthread_rwlock_unlock): Adapt. * nptl/pthread_rwlock_wrlock.c (__pthread_rwlock_wrlock_slow): Remove. (__pthread_rwlock_wrlock): Adapt. * nptl/tst-rwlock10.c: Adapt. * nptl/tst-rwlock11.c: Adapt. * nptl/tst-rwlock17.c: New file. * nptl/tst-rwlock18.c: New file. * nptl/tst-rwlock19.c: New file. * nptl/tst-rwlock2b.c: New file. * nptl/tst-rwlock8.c: Adapt. * nptl/tst-rwlock9.c: Adapt. * sysdeps/aarch64/nptl/bits/pthreadtypes.h (pthread_rwlock_t): Adapt. * sysdeps/arm/nptl/bits/pthreadtypes.h (pthread_rwlock_t): Adapt. * sysdeps/hppa/nptl/bits/pthreadtypes.h (pthread_rwlock_t): Adapt. * sysdeps/ia64/nptl/bits/pthreadtypes.h (pthread_rwlock_t): Adapt. * sysdeps/m68k/nptl/bits/pthreadtypes.h (pthread_rwlock_t): Adapt. * sysdeps/microblaze/nptl/bits/pthreadtypes.h (pthread_rwlock_t): Adapt. * sysdeps/mips/nptl/bits/pthreadtypes.h (pthread_rwlock_t): Adapt. * sysdeps/nios2/nptl/bits/pthreadtypes.h (pthread_rwlock_t): Adapt. * sysdeps/s390/nptl/bits/pthreadtypes.h (pthread_rwlock_t): Adapt. * sysdeps/sh/nptl/bits/pthreadtypes.h (pthread_rwlock_t): Adapt. * sysdeps/sparc/nptl/bits/pthreadtypes.h (pthread_rwlock_t): Adapt. * sysdeps/tile/nptl/bits/pthreadtypes.h (pthread_rwlock_t): Adapt. * sysdeps/unix/sysv/linux/alpha/bits/pthreadtypes.h (pthread_rwlock_t): Adapt. * sysdeps/unix/sysv/linux/powerpc/bits/pthreadtypes.h (pthread_rwlock_t): Adapt. * sysdeps/x86/bits/pthreadtypes.h (pthread_rwlock_t): Adapt. * nptl/nptl-printers.py (): Adapt. * nptl/nptl_lock_constants.pysym: Adapt. * nptl/test-rwlock-printers.py: Adapt. * nptl/test-rwlockattr-printers.c: Adapt. * nptl/test-rwlockattr-printers.py: Adapt.
68 lines
1.7 KiB
Plaintext
68 lines
1.7 KiB
Plaintext
#include <pthreadP.h>
|
|
|
|
-- Mutex types
|
|
PTHREAD_MUTEX_KIND_MASK PTHREAD_MUTEX_KIND_MASK_NP
|
|
PTHREAD_MUTEX_NORMAL
|
|
PTHREAD_MUTEX_RECURSIVE PTHREAD_MUTEX_RECURSIVE_NP
|
|
PTHREAD_MUTEX_ERRORCHECK PTHREAD_MUTEX_ERRORCHECK_NP
|
|
PTHREAD_MUTEX_ADAPTIVE_NP
|
|
|
|
-- Mutex status
|
|
-- These are hardcoded all over the code; there are no enums/macros for them.
|
|
PTHREAD_MUTEX_DESTROYED -1
|
|
PTHREAD_MUTEX_UNLOCKED 0
|
|
PTHREAD_MUTEX_LOCKED_NO_WAITERS 1
|
|
|
|
-- For robust mutexes
|
|
PTHREAD_MUTEX_INCONSISTENT
|
|
PTHREAD_MUTEX_NOTRECOVERABLE
|
|
FUTEX_OWNER_DIED
|
|
|
|
-- For robust and PI mutexes
|
|
FUTEX_WAITERS
|
|
FUTEX_TID_MASK
|
|
|
|
-- Mutex attributes
|
|
PTHREAD_MUTEX_ROBUST_NORMAL_NP
|
|
PTHREAD_MUTEX_PRIO_INHERIT_NP
|
|
PTHREAD_MUTEX_PRIO_PROTECT_NP
|
|
PTHREAD_MUTEX_PSHARED_BIT
|
|
PTHREAD_MUTEX_PRIO_CEILING_SHIFT
|
|
PTHREAD_MUTEX_PRIO_CEILING_MASK
|
|
|
|
-- Mutex attribute flags
|
|
PTHREAD_MUTEXATTR_PROTOCOL_SHIFT
|
|
PTHREAD_MUTEXATTR_PROTOCOL_MASK
|
|
PTHREAD_MUTEXATTR_PRIO_CEILING_MASK
|
|
PTHREAD_MUTEXATTR_FLAG_ROBUST
|
|
PTHREAD_MUTEXATTR_FLAG_PSHARED
|
|
PTHREAD_MUTEXATTR_FLAG_BITS
|
|
PTHREAD_MUTEX_NO_ELISION_NP
|
|
|
|
-- Priority protocols
|
|
PTHREAD_PRIO_NONE
|
|
PTHREAD_PRIO_INHERIT
|
|
PTHREAD_PRIO_PROTECT
|
|
|
|
-- Condition variable
|
|
-- FIXME Why do macros prefixed with __ cannot be used directly?
|
|
PTHREAD_COND_SHARED_MASK __PTHREAD_COND_SHARED_MASK
|
|
PTHREAD_COND_CLOCK_MONOTONIC_MASK __PTHREAD_COND_CLOCK_MONOTONIC_MASK
|
|
COND_CLOCK_BITS
|
|
-- These values are hardcoded:
|
|
PTHREAD_COND_WREFS_SHIFT 3
|
|
|
|
-- Rwlock attributes
|
|
PTHREAD_RWLOCK_PREFER_READER_NP
|
|
PTHREAD_RWLOCK_PREFER_WRITER_NP
|
|
PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP
|
|
|
|
-- Rwlock
|
|
PTHREAD_RWLOCK_WRPHASE
|
|
PTHREAD_RWLOCK_WRLOCKED
|
|
PTHREAD_RWLOCK_READER_SHIFT
|
|
|
|
-- 'Shared' attribute values
|
|
PTHREAD_PROCESS_PRIVATE
|
|
PTHREAD_PROCESS_SHARED
|