1 files changed, 51 insertions, 10 deletions

diff --git a/src/corelib/thread/qreadwritelock_p.h b/src/corelib/thread/qreadwritelock_p.h
index b0f4e1e5f5..68fa642a73 100644
--- a/src/corelib/thread/qreadwritelock_p.h
+++ b/src/corelib/thread/qreadwritelock_p.h
@@ -16,23 +16,39 @@
 // We mean it.
 //
 
-#include <QtCore/private/qglobal_p.h>
+#include <QtCore/private/qlocking_p.h>
 #include <QtCore/private/qwaitcondition_p.h>
+#include <QtCore/qreadwritelock.h>
 #include <QtCore/qvarlengtharray.h>
 
 QT_REQUIRE_CONFIG(thread);
 
 QT_BEGIN_NAMESPACE
 
+namespace QReadWriteLockStates {
+enum {
+    StateMask = 0x3,
+    StateLockedForRead = 0x1,
+    StateLockedForWrite = 0x2,
+};
+enum StateForWaitCondition {
+    LockedForRead,
+    LockedForWrite,
+    Unlocked,
+    RecursivelyLocked
+};
+}
+
 class QReadWriteLockPrivate
 {
 public:
     explicit QReadWriteLockPrivate(bool isRecursive = false)
         : recursive(isRecursive) {}
 
-    QtPrivate::mutex mutex;
-    QtPrivate::condition_variable writerCond;
-    QtPrivate::condition_variable readerCond;
+    alignas(QtPrivate::IdealMutexAlignment) std::condition_variable writerCond;
+    std::condition_variable readerCond;
+
+    alignas(QtPrivate::IdealMutexAlignment) std::mutex mutex;
     int readerCount = 0;
     int writerCount = 0;
     int waitingReaders = 0;
@@ -40,8 +56,8 @@ public:
     const bool recursive;
 
     //Called with the mutex locked
-    bool lockForWrite(std::unique_lock<QtPrivate::mutex> &lock, int timeout);
-    bool lockForRead(std::unique_lock<QtPrivate::mutex> &lock, int timeout);
+    bool lockForWrite(std::unique_lock<std::mutex> &lock, QDeadlineTimer timeout);
+    bool lockForRead(std::unique_lock<std::mutex> &lock, QDeadlineTimer timeout);
     void unlock();
 
     //memory management
@@ -49,7 +65,7 @@ public:
     void release();
     static QReadWriteLockPrivate *allocate();
 
-    // Recusive mutex handling
+    // Recursive mutex handling
     Qt::HANDLE currentWriter = {};
 
     struct Reader {
@@ -60,11 +76,36 @@ public:
     QVarLengthArray<Reader, 16> currentReaders;
 
     // called with the mutex unlocked
-    bool recursiveLockForWrite(int timeout);
-    bool recursiveLockForRead(int timeout);
+    bool recursiveLockForWrite(QDeadlineTimer timeout);
+    bool recursiveLockForRead(QDeadlineTimer timeout);
     void recursiveUnlock();
+
+    static QReadWriteLockStates::StateForWaitCondition
+    stateForWaitCondition(const QReadWriteLock *lock);
 };
-Q_DECLARE_TYPEINFO(QReadWriteLockPrivate::Reader, Q_PRIMITIVE_TYPE);
+Q_DECLARE_TYPEINFO(QReadWriteLockPrivate::Reader, Q_PRIMITIVE_TYPE);\
+
+/*! \internal  Helper for QWaitCondition::wait */
+inline QReadWriteLockStates::StateForWaitCondition
+QReadWriteLockPrivate::stateForWaitCondition(const QReadWriteLock *q)
+{
+    using namespace QReadWriteLockStates;
+    QReadWriteLockPrivate *d = q->d_ptr.loadAcquire();
+    switch (quintptr(d) & StateMask) {
+    case StateLockedForRead: return LockedForRead;
+    case StateLockedForWrite: return LockedForWrite;
+    }
+
+    if (!d)
+        return Unlocked;
+    const auto lock = qt_scoped_lock(d->mutex);
+    if (d->writerCount > 1)
+        return RecursivelyLocked;
+    else if (d->writerCount == 1)
+        return LockedForWrite;
+    return LockedForRead;
+
+}
 
 QT_END_NAMESPACE