whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QMutexLocker: strenghten the locking operations 

There is no reason to allow relock() on a locked locker, or unlock()
or an unlocked one, just like we don't allow that on a plain mutex
to begin with. The docs already said that e.g. relock() locks an
_unlocked_ locker.

[ChangeLog][QtCore][QMutexLocker] QMutexLocker allowed relock() and
unlock() on an already closed (resp. open) locker object. These
semantics have always been undocumented and are now unsupported
(in both cases they yield undefined behavior.)

Change-Id: Id5f67beb5dc30d6435dae88a3085fba93ec7d96e
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
bb10
Giuseppe D'Angelo 2022-03-06 15:12:51 +01:00
parent 9ec05e4f36
commit 1b14569753
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/corelib/thread/qmutex.h
View File

@ -256,7 +256,8 @@ public:
inline ~QMutexLocker()
{
unlock();
if (m_isLocked)
unlock();
}
inline bool isLocked() const noexcept
@ -266,20 +267,16 @@ public:
inline void unlock() noexcept
{
if (!m_isLocked)
return;
Q_ASSERT(m_isLocked);
m_mutex->unlock();
m_isLocked = false;
}
inline void relock() QT_MUTEX_LOCK_NOEXCEPT
{
if (m_isLocked)
return;
if (m_mutex) {
m_mutex->lock();
m_isLocked = true;
}
Q_ASSERT(!m_isLocked);
m_mutex->lock();
m_isLocked = true;
}
inline void swap(QMutexLocker &other) noexcept

3
tests/auto/corelib/thread/qmutexlocker/tst_qmutexlocker.cpp
View File

@ -180,9 +180,6 @@ void tst_QMutexLocker::lockerStateTest()
QMutexLocker locker(&mutex);
QVERIFY(locker.isLocked());
locker.relock();
QVERIFY(locker.isLocked());
locker.unlock();
QVERIFY(!locker.isLocked());