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

QMutexLocker: code tidies

Browse Source 
Rename isLocked in preparation for a future commit. Rename m
as well for consistency.

Change-Id: I1c8d040bca6825a698ec804ea142d208abacd5cc
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Giuseppe D'Angelo 2022-03-06 14:29:54 +01:00
parent 77e4177d16
commit f875ff5180
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -240,43 +240,45 @@ class [[nodiscard]] QMutexLocker
public: public:
inline explicit QMutexLocker(Mutex *mutex) QT_MUTEX_LOCK_NOEXCEPT inline explicit QMutexLocker(Mutex *mutex) QT_MUTEX_LOCK_NOEXCEPT
{ {
m = mutex; m_mutex = mutex;
if (Q_LIKELY(mutex)) { if (Q_LIKELY(mutex)) {
mutex->lock(); mutex->lock();
isLocked = true; m_isLocked = true;
} }
} }
inline ~QMutexLocker() {
inline ~QMutexLocker()
{
unlock(); unlock();
} }
inline void unlock() noexcept inline void unlock() noexcept
{ {
if (!isLocked) if (!m_isLocked)
return; return;
m->unlock(); m_mutex->unlock();
isLocked = false; m_isLocked = false;
} }
inline void relock() QT_MUTEX_LOCK_NOEXCEPT inline void relock() QT_MUTEX_LOCK_NOEXCEPT
{ {
if (isLocked) if (m_isLocked)
return; return;
if (m) { if (m_mutex) {
m->lock(); m_mutex->lock();
isLocked = true; m_isLocked = true;
} }
} }
Mutex *mutex() const Mutex *mutex() const
{ {
return m; return m_mutex;
} }
private: private:
Q_DISABLE_COPY(QMutexLocker) Q_DISABLE_COPY(QMutexLocker)
Mutex *m; Mutex *m_mutex;
bool isLocked = false; bool m_isLocked = false;
}; };
#else // !QT_CONFIG(thread) && !Q_CLANG_QDOC #else // !QT_CONFIG(thread) && !Q_CLANG_QDOC