1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QReadWriteLock: force the loop to exist in a separate function

Browse Source 
This allows the fast, uncontended case to exist in a function that does
much less work and therefore needs to save less state in its
prologue. This is interesting too for LTO because the compiler can then
inline the fast, uncontended path where the locks were used.

Change-Id: I3d728c4197df49169066fffd1756dc04d8a5f04a
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
(cherry picked from commit 834c755977bbfe66e041aba6d2dfa69954eb3808)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Thiago Macieira 2023-04-17 16:14:37 -07:00 committed by Qt Cherry-pick Bot
parent ac111209f8
commit 916b4d521b
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/corelib/thread/qreadwritelock.cpp
View File

@ -39,6 +39,11 @@ inline bool isUncontendedLocked(const QReadWriteLockPrivate *d)
{ return quintptr(d) & StateMask; }
}
static bool contendedTryLockForRead(QAtomicPointer<QReadWriteLockPrivate> &d_ptr,
int timeout, QReadWriteLockPrivate *d);
static bool contendedTryLockForWrite(QAtomicPointer<QReadWriteLockPrivate> &d_ptr,
int timeout, QReadWriteLockPrivate *d);
/*! \class QReadWriteLock
\inmodule QtCore
\brief The QReadWriteLock class provides read-write locking.
@ -137,8 +142,6 @@ QReadWriteLock::~QReadWriteLock()
*/
void QReadWriteLock::lockForRead()
{
if (d_ptr.testAndSetAcquire(nullptr, dummyLockedForRead))
return;
tryLockForRead(-1);
}
@ -188,7 +191,12 @@ bool QReadWriteLock::tryLockForRead(int timeout)
QReadWriteLockPrivate *d;
if (d_ptr.testAndSetAcquire(nullptr, dummyLockedForRead, d))
return true;
return contendedTryLockForRead(d_ptr, timeout, d);
}
Q_NEVER_INLINE static bool contendedTryLockForRead(QAtomicPointer<QReadWriteLockPrivate> &d_ptr,
int timeout, QReadWriteLockPrivate *d)
{
while (true) {
if (d == nullptr) {
if (!d_ptr.testAndSetAcquire(nullptr, dummyLockedForRead, d))
@ -302,7 +310,12 @@ bool QReadWriteLock::tryLockForWrite(int timeout)
QReadWriteLockPrivate *d;
if (d_ptr.testAndSetAcquire(nullptr, dummyLockedForWrite, d))
return true;
return contendedTryLockForWrite(d_ptr, timeout, d);
}
Q_NEVER_INLINE static bool contendedTryLockForWrite(QAtomicPointer<QReadWriteLockPrivate> &d_ptr,
int timeout, QReadWriteLockPrivate *d)
{
while (true) {
if (d == nullptr) {
if (!d_ptr.testAndSetAcquire(d, dummyLockedForWrite, d))