1 files changed, 20 insertions, 47 deletions

diff --git a/tests/auto/corelib/thread/qreadwritelock/tst_qreadwritelock.cpp b/tests/auto/corelib/thread/qreadwritelock/tst_qreadwritelock.cpp
index f1468817ec..86dfa5faff 100644
--- a/tests/auto/corelib/thread/qreadwritelock/tst_qreadwritelock.cpp
+++ b/tests/auto/corelib/thread/qreadwritelock/tst_qreadwritelock.cpp
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2021 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2021 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 #include <QTest>
 #include <QSemaphore>
@@ -40,10 +15,6 @@
 #ifdef Q_OS_UNIX
 #include <unistd.h>
 #endif
-#if defined(Q_OS_WIN)
-#  include <qt_windows.h>
-#  define sleep(X) Sleep(X)
-#endif
 
 //on solaris, threads that loop on the release bool variable
 //needs to sleep more than 1 usec.
@@ -55,6 +26,8 @@
 
 #include <stdio.h>
 
+using namespace std::chrono_literals;
+
 class tst_QReadWriteLock : public QObject
 {
     Q_OBJECT
@@ -497,8 +470,8 @@ class ReadLockLoopThread : public QThread
 public:
     QReadWriteLock &testRwlock;
     int runTime;
-    int holdTime;
-    int waitTime;
+    std::chrono::milliseconds holdTime;
+    std::chrono::milliseconds waitTime;
     bool print;
     QElapsedTimer t;
     inline ReadLockLoopThread(QReadWriteLock &l, int runTime, int holdTime=0, int waitTime=0, bool print=false)
@@ -514,9 +487,9 @@ public:
         while (t.elapsed()<runTime)  {
             testRwlock.lockForRead();
             if(print) printf("reading\n");
-            if (holdTime) msleep(ulong(holdTime));
+            if (holdTime > 0ms) sleep(holdTime);
             testRwlock.unlock();
-            if (waitTime) msleep(ulong(waitTime));
+            if (waitTime > 0ms) sleep(waitTime);
         }
     }
 };
@@ -533,8 +506,8 @@ class WriteLockLoopThread : public QThread
 public:
     QReadWriteLock &testRwlock;
     int runTime;
-    int holdTime;
-    int waitTime;
+    std::chrono::milliseconds holdTime;
+    std::chrono::milliseconds waitTime;
     bool print;
     QElapsedTimer t;
     inline WriteLockLoopThread(QReadWriteLock &l, int runTime, int holdTime=0, int waitTime=0, bool print=false)
@@ -550,9 +523,9 @@ public:
         while (t.elapsed() < runTime)  {
             testRwlock.lockForWrite();
             if (print) printf(".");
-            if (holdTime) msleep(ulong(holdTime));
+            if (holdTime > 0ms) sleep(holdTime);
             testRwlock.unlock();
-            if (waitTime) msleep(ulong(waitTime));
+            if (waitTime > 0ms) sleep(waitTime);
         }
     }
 };
@@ -572,7 +545,7 @@ class WriteLockCountThread : public QThread
 public:
     QReadWriteLock &testRwlock;
     int runTime;
-    int waitTime;
+    std::chrono::milliseconds waitTime;
     int maxval;
     QElapsedTimer t;
     inline WriteLockCountThread(QReadWriteLock &l, int runTime, int waitTime, int maxval)
@@ -593,7 +566,7 @@ public:
                 QtPrivate::volatilePreIncrement(count);
             count=0;
             testRwlock.unlock();
-            msleep(ulong(waitTime));
+            sleep(waitTime);
         }
     }
 };
@@ -610,7 +583,7 @@ class ReadLockCountThread : public QThread
 public:
     QReadWriteLock &testRwlock;
     int runTime;
-    int waitTime;
+    std::chrono::milliseconds waitTime;
     QElapsedTimer t;
     inline ReadLockCountThread(QReadWriteLock &l, int runTime, int waitTime)
     :testRwlock(l)
@@ -625,7 +598,7 @@ public:
             if(count)
                 qFatal("Non-zero count at Read! (%d)",count );
             testRwlock.unlock();
-            msleep(ulong(waitTime));
+            sleep(waitTime);
         }
     }
 };
@@ -642,7 +615,7 @@ void tst_QReadWriteLock::readLockBlockRelease()
     threadDone=false;
     ReadLockThread rlt(testLock);
     rlt.start();
-    sleep(1);
+    QThread::sleep(1s);
     testLock.unlock();
     rlt.wait();
     QVERIFY(threadDone);
@@ -659,7 +632,7 @@ void tst_QReadWriteLock::writeLockBlockRelease()
     threadDone=false;
     WriteLockThread wlt(testLock);
     wlt.start();
-    sleep(1);
+    QThread::sleep(1s);
     testLock.unlock();
     wlt.wait();
     QVERIFY(threadDone);
@@ -678,10 +651,10 @@ void tst_QReadWriteLock::multipleReadersBlockRelease()
     ReadLockReleasableThread rlt2(testLock);
     rlt1.start();
     rlt2.start();
-    sleep(1);
+    QThread::sleep(1s);
     WriteLockThread wlt(testLock);
     wlt.start();
-    sleep(1);
+    QThread::sleep(1s);
     release.storeRelaxed(true);
     wlt.wait();
     rlt1.wait();