Use constexpr for constants and ranged-based for loops

In the process, actually use the constants as the size of some arrays,
instead of making [1024] arrays and then only using a few entries.

Change-Id: I9f36b322840393b8680788190cf8b40a828f4957
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>

1 files changed, 89 insertions, 99 deletions

diff --git a/tests/auto/corelib/thread/qreadwritelock/tst_qreadwritelock.cpp b/tests/auto/corelib/thread/qreadwritelock/tst_qreadwritelock.cpp
index a6c0ebae22..2f1839b1d9 100644
--- a/tests/auto/corelib/thread/qreadwritelock/tst_qreadwritelock.cpp
+++ b/tests/auto/corelib/thread/qreadwritelock/tst_qreadwritelock.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** 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.
@@ -693,27 +693,26 @@ void tst_QReadWriteLock::multipleReadersBlockRelease()
 */
 void tst_QReadWriteLock::multipleReadersLoop()
 {
-    int time=500;
-    int hold=250;
-    int wait=0;
+    constexpr int time = 500;
+    constexpr int hold = 250;
+    constexpr int wait = 0;
 #if defined (Q_OS_HPUX)
-    const int numthreads=50;
+    constexpr int NumThreads = 50;
 #elif defined(Q_OS_VXWORKS)
-    const int numthreads=40;
+    constexpr int NumThreads = 40;
 #else
-    const int numthreads=75;
+    constexpr int NumThreads = 75;
 #endif
     QReadWriteLock testLock;
-    ReadLockLoopThread *threads[numthreads];
-    int i;
-    for (i=0; i<numthreads; ++i)
-        threads[i] = new ReadLockLoopThread(testLock, time, hold, wait);
-    for (i=0; i<numthreads; ++i)
-        threads[i]->start();
-    for (i=0; i<numthreads; ++i)
-        threads[i]->wait();
-    for (i=0; i<numthreads; ++i)
-        delete threads[i];
+    ReadLockLoopThread *threads[NumThreads];
+    for (auto &thread : threads)
+        thread = new ReadLockLoopThread(testLock, time, hold, wait);
+    for (auto thread : threads)
+        thread->start();
+    for (auto thread : threads)
+        thread->wait();
+    for (auto thread : threads)
+        delete thread;
 }
 
 /*
@@ -721,21 +720,20 @@ void tst_QReadWriteLock::multipleReadersLoop()
 */
 void tst_QReadWriteLock::multipleWritersLoop()
 {
-        int time=500;
-        int wait=0;
-        int hold=0;
-        const int numthreads=50;
-        QReadWriteLock testLock;
-        WriteLockLoopThread *threads[numthreads];
-        int i;
-        for (i=0; i<numthreads; ++i)
-            threads[i] = new WriteLockLoopThread(testLock, time, hold, wait);
-        for (i=0; i<numthreads; ++i)
-            threads[i]->start();
-        for (i=0; i<numthreads; ++i)
-            threads[i]->wait();
-        for (i=0; i<numthreads; ++i)
-            delete threads[i];
+    constexpr int time = 500;
+    constexpr int wait = 0;
+    constexpr int hold = 0;
+    constexpr int numthreads = 50;
+    QReadWriteLock testLock;
+    WriteLockLoopThread *threads[numthreads];
+    for (auto &thread : threads)
+        thread = new WriteLockLoopThread(testLock, time, hold, wait);
+    for (auto thread : threads)
+        thread->start();
+    for (auto thread : threads)
+        thread->wait();
+    for (auto thread : threads)
+        delete thread;
 }
 
 /*
@@ -743,40 +741,36 @@ void tst_QReadWriteLock::multipleWritersLoop()
 */
 void tst_QReadWriteLock::multipleReadersWritersLoop()
 {
-        //int time=INT_MAX;
-        int time=10000;
-        int readerThreads=20;
-        int readerWait=0;
-        int readerHold=1;
-
-        int writerThreads=2;
-        int writerWait=500;
-        int writerHold=50;
-
-        QReadWriteLock testLock;
-        ReadLockLoopThread  *readers[1024];
-        WriteLockLoopThread *writers[1024];
-        int i;
-
-        for (i=0; i<readerThreads; ++i)
-            readers[i] = new ReadLockLoopThread(testLock, time, readerHold, readerWait, false);
-        for (i=0; i<writerThreads; ++i)
-            writers[i] = new WriteLockLoopThread(testLock, time, writerHold, writerWait, false);
-
-        for (i=0; i<readerThreads; ++i)
-            readers[i]->start(QThread::NormalPriority);
-        for (i=0; i<writerThreads; ++i)
-            writers[i]->start(QThread::IdlePriority);
-
-        for (i=0; i<readerThreads; ++i)
-            readers[i]->wait();
-        for (i=0; i<writerThreads; ++i)
-            writers[i]->wait();
-
-        for (i=0; i<readerThreads; ++i)
-            delete readers[i];
-        for (i=0; i<writerThreads; ++i)
-            delete writers[i];
+    constexpr int time = 10000; // INT_MAX
+    constexpr int readerThreads = 20;
+    constexpr int readerWait = 0;
+    constexpr int readerHold = 1;
+
+    constexpr int writerThreads = 2;
+    constexpr int writerWait = 500;
+    constexpr int writerHold = 50;
+
+    QReadWriteLock testLock;
+    ReadLockLoopThread  *readers[readerThreads];
+    WriteLockLoopThread *writers[writerThreads];
+
+    for (auto &thread : readers)
+        thread = new ReadLockLoopThread(testLock, time, readerHold, readerWait, false);
+    for (auto &thread : writers)
+        thread = new WriteLockLoopThread(testLock, time, writerHold, writerWait, false);
+    for (auto thread : readers)
+        thread->start(QThread::NormalPriority);
+    for (auto thread : writers)
+        thread->start(QThread::IdlePriority);
+
+    for (auto thread : readers)
+        thread->wait();
+    for (auto thread : writers)
+        thread->wait();
+    for (auto thread : readers)
+        delete thread;
+    for (auto thread : writers)
+        delete thread;
 }
 
 /*
@@ -785,39 +779,35 @@ void tst_QReadWriteLock::multipleReadersWritersLoop()
 */
 void tst_QReadWriteLock::countingTest()
 {
-        //int time=INT_MAX;
-        int time=10000;
-        int readerThreads=20;
-        int readerWait=1;
-
-        int writerThreads=3;
-        int writerWait=150;
-        int maxval=10000;
-
-        QReadWriteLock testLock;
-        ReadLockCountThread  *readers[1024];
-        WriteLockCountThread *writers[1024];
-        int i;
-
-        for (i=0; i<readerThreads; ++i)
-            readers[i] = new ReadLockCountThread(testLock, time,  readerWait);
-        for (i=0; i<writerThreads; ++i)
-            writers[i] = new WriteLockCountThread(testLock, time,  writerWait, maxval);
-
-        for (i=0; i<readerThreads; ++i)
-            readers[i]->start(QThread::NormalPriority);
-        for (i=0; i<writerThreads; ++i)
-            writers[i]->start(QThread::LowestPriority);
-
-        for (i=0; i<readerThreads; ++i)
-            readers[i]->wait();
-        for (i=0; i<writerThreads; ++i)
-            writers[i]->wait();
-
-        for (i=0; i<readerThreads; ++i)
-            delete readers[i];
-        for (i=0; i<writerThreads; ++i)
-            delete writers[i];
+    constexpr int time = 10000; // INT_MAX
+    constexpr int readerThreads = 20;
+    constexpr int readerWait = 1;
+
+    constexpr int writerThreads = 3;
+    constexpr int writerWait = 150;
+    constexpr int maxval = 10000;
+
+    QReadWriteLock testLock;
+    ReadLockCountThread  *readers[readerThreads];
+    WriteLockCountThread *writers[writerThreads];
+
+    for (auto &thread : readers)
+        thread = new ReadLockCountThread(testLock, time,  readerWait);
+    for (auto &thread : writers)
+        thread = new WriteLockCountThread(testLock, time,  writerWait, maxval);
+    for (auto thread : readers)
+        thread->start(QThread::NormalPriority);
+    for (auto thread : writers)
+        thread->start(QThread::LowestPriority);
+
+    for (auto thread : readers)
+        thread->wait();
+    for (auto thread : writers)
+        thread->wait();
+    for (auto thread : readers)
+        delete thread;
+    for (auto thread : writers)
+        delete thread;
 }
 
 void tst_QReadWriteLock::limitedReaders()