summaryrefslogtreecommitdiffstats
path: root/tests/benchmarks/corelib/thread/qwaitcondition
diff options
context:
space:
mode:
Diffstat (limited to 'tests/benchmarks/corelib/thread/qwaitcondition')
-rw-r--r--tests/benchmarks/corelib/thread/qwaitcondition/CMakeLists.txt12
-rw-r--r--tests/benchmarks/corelib/thread/qwaitcondition/qwaitcondition.pro6
-rw-r--r--tests/benchmarks/corelib/thread/qwaitcondition/tst_bench_qwaitcondition.cpp174
-rw-r--r--tests/benchmarks/corelib/thread/qwaitcondition/tst_qwaitcondition.cpp129
4 files changed, 179 insertions, 142 deletions
diff --git a/tests/benchmarks/corelib/thread/qwaitcondition/CMakeLists.txt b/tests/benchmarks/corelib/thread/qwaitcondition/CMakeLists.txt
index d686746e58..c7a15f9e8a 100644
--- a/tests/benchmarks/corelib/thread/qwaitcondition/CMakeLists.txt
+++ b/tests/benchmarks/corelib/thread/qwaitcondition/CMakeLists.txt
@@ -1,15 +1,13 @@
-# Generated from qwaitcondition.pro.
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
#####################################################################
## tst_bench_qwaitcondition Binary:
#####################################################################
-qt_add_benchmark(tst_bench_qwaitcondition
+qt_internal_add_benchmark(tst_bench_qwaitcondition
SOURCES
- tst_qwaitcondition.cpp
- PUBLIC_LIBRARIES
+ tst_bench_qwaitcondition.cpp
+ LIBRARIES
Qt::Test
)
-
-#### Keys ignored in scope 1:.:.:qwaitcondition.pro:<TRUE>:
-# TEMPLATE = "app"
diff --git a/tests/benchmarks/corelib/thread/qwaitcondition/qwaitcondition.pro b/tests/benchmarks/corelib/thread/qwaitcondition/qwaitcondition.pro
deleted file mode 100644
index cc801bdc13..0000000000
--- a/tests/benchmarks/corelib/thread/qwaitcondition/qwaitcondition.pro
+++ /dev/null
@@ -1,6 +0,0 @@
-TEMPLATE = app
-CONFIG += benchmark
-QT = core testlib
-
-TARGET = tst_bench_qwaitcondition
-SOURCES += tst_qwaitcondition.cpp
diff --git a/tests/benchmarks/corelib/thread/qwaitcondition/tst_bench_qwaitcondition.cpp b/tests/benchmarks/corelib/thread/qwaitcondition/tst_bench_qwaitcondition.cpp
new file mode 100644
index 0000000000..0abd53fc93
--- /dev/null
+++ b/tests/benchmarks/corelib/thread/qwaitcondition/tst_bench_qwaitcondition.cpp
@@ -0,0 +1,174 @@
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
+
+#include <QtCore/QtCore>
+#include <QTest>
+
+#include <math.h>
+#include <condition_variable>
+#include <mutex>
+
+#include <limits.h>
+
+using namespace std::chrono_literals;
+
+class tst_QWaitCondition : public QObject
+{
+ Q_OBJECT
+
+public:
+ tst_QWaitCondition()
+ {
+ }
+
+private slots:
+ void oscillate_QWaitCondition_QMutex_data() { oscillate_mutex_data(); }
+ void oscillate_QWaitCondition_QMutex();
+ void oscillate_QWaitCondition_QReadWriteLock_data() { oscillate_mutex_data(); }
+ void oscillate_QWaitCondition_QReadWriteLock();
+ void oscillate_std_condition_variable_std_mutex_data() { oscillate_mutex_data(); }
+ void oscillate_std_condition_variable_std_mutex();
+ void oscillate_std_condition_variable_any_QMutex_data() { oscillate_mutex_data(); }
+ void oscillate_std_condition_variable_any_QMutex();
+ void oscillate_std_condition_variable_any_QReadWriteLock_data() { oscillate_mutex_data(); }
+ void oscillate_std_condition_variable_any_QReadWriteLock();
+
+private:
+ void oscillate_mutex_data();
+};
+
+
+int turn;
+const int threadCount = 10;
+QWaitCondition cond;
+std::condition_variable cv;
+std::condition_variable_any cva;
+
+template <typename Cond>
+Cond *get();
+
+template <> std::condition_variable *get() { return &cv; }
+template <> std::condition_variable_any *get() { return &cva; }
+
+template <class Cond, class Mutex, class Locker>
+class OscillateThread : public QThread
+{
+public:
+ Mutex *mutex;
+ int m_threadid;
+ unsigned long timeout;
+
+ void run() override
+ {
+ for (int count = 0; count < 5000; ++count) {
+ Locker lock(*mutex);
+ while (m_threadid != turn) {
+ if (timeout == ULONG_MAX)
+ get<Cond>()->wait(lock);
+ else if (timeout == 0) // Windows doesn't unlock the mutex with a zero timeout
+ get<Cond>()->wait_for(lock, 1ns);
+ else
+ get<Cond>()->wait_for(lock, timeout * 1ms);
+ }
+ turn = (turn+1) % threadCount;
+ get<Cond>()->notify_all();
+ }
+ }
+};
+
+template <class Mutex, class Locker>
+class OscillateThread<QWaitCondition, Mutex, Locker> : public QThread
+{
+public:
+ Mutex *mutex;
+ int m_threadid;
+ unsigned long timeout;
+
+ void run() override
+ {
+ for (int count = 0; count < 5000; ++count) {
+
+ Locker lock(mutex);
+ while (m_threadid != turn) {
+ cond.wait(mutex, timeout);
+ }
+ turn = (turn+1) % threadCount;
+ cond.wakeAll();
+ }
+ }
+};
+
+template <class Cond, class Mutex, class Locker>
+void oscillate(unsigned long timeout) {
+
+ OscillateThread<Cond, Mutex, Locker> thrd[threadCount];
+ Mutex m;
+ for (int i = 0; i < threadCount; ++i) {
+ thrd[i].mutex = &m;
+ thrd[i].m_threadid = i;
+ thrd[i].timeout = timeout;
+ }
+
+ QBENCHMARK {
+ for (int i = 0; i < threadCount; ++i) {
+ thrd[i].start();
+ }
+ for (int i = 0; i < threadCount; ++i) {
+ thrd[i].wait();
+ }
+ }
+
+}
+
+void tst_QWaitCondition::oscillate_mutex_data()
+{
+ QTest::addColumn<unsigned long>("timeout");
+
+ QTest::newRow("0") << 0ul;
+ QTest::newRow("1") << 1ul;
+ QTest::newRow("1000") << 1000ul;
+ QTest::newRow("forever") << ULONG_MAX;
+}
+
+void tst_QWaitCondition::oscillate_QWaitCondition_QMutex()
+{
+ QFETCH(unsigned long, timeout);
+ oscillate<QWaitCondition, QMutex, QMutexLocker<QMutex>>(timeout);
+}
+
+void tst_QWaitCondition::oscillate_QWaitCondition_QReadWriteLock()
+{
+ QFETCH(unsigned long, timeout);
+ oscillate<QWaitCondition, QReadWriteLock, QWriteLocker>(timeout);
+}
+
+void tst_QWaitCondition::oscillate_std_condition_variable_std_mutex()
+{
+ QFETCH(unsigned long, timeout);
+ oscillate<std::condition_variable, std::mutex, std::unique_lock<std::mutex>>(timeout);
+}
+
+
+void tst_QWaitCondition::oscillate_std_condition_variable_any_QMutex()
+{
+ QFETCH(unsigned long, timeout);
+ oscillate<std::condition_variable_any, QMutex, std::unique_lock<QMutex>>(timeout);
+}
+
+
+void tst_QWaitCondition::oscillate_std_condition_variable_any_QReadWriteLock()
+{
+ QFETCH(unsigned long, timeout);
+
+ struct WriteLocker : QWriteLocker {
+ // adapt to BasicLockable
+ explicit WriteLocker(QReadWriteLock &m) : QWriteLocker{&m} {}
+ void lock() { relock(); }
+ };
+
+ oscillate<std::condition_variable_any, QReadWriteLock, WriteLocker>(timeout);
+}
+
+QTEST_MAIN(tst_QWaitCondition)
+
+#include "tst_bench_qwaitcondition.moc"
diff --git a/tests/benchmarks/corelib/thread/qwaitcondition/tst_qwaitcondition.cpp b/tests/benchmarks/corelib/thread/qwaitcondition/tst_qwaitcondition.cpp
deleted file mode 100644
index a8c66b4353..0000000000
--- a/tests/benchmarks/corelib/thread/qwaitcondition/tst_qwaitcondition.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 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$
-**
-****************************************************************************/
-
-#include <QtCore/QtCore>
-#include <QtTest/QtTest>
-
-#include <math.h>
-
-
-class tst_QWaitCondition : public QObject
-{
- Q_OBJECT
-
-public:
- tst_QWaitCondition()
- {
- }
-
-private slots:
- void oscillate_mutex_data();
- void oscillate_mutex();
- void oscillate_writelock_data();
- void oscillate_writelock();
-};
-
-
-int turn;
-const int threadCount = 10;
-QWaitCondition cond;
-
-template <class Mutex, class Locker>
-class OscillateThread : public QThread
-{
-public:
- Mutex *mutex;
- int m_threadid;
- int timeout;
-
- void run()
- {
- for (int count = 0; count < 5000; ++count) {
-
- Locker lock(mutex);
- while (m_threadid != turn) {
- cond.wait(mutex, timeout);
- }
- turn = (turn+1) % threadCount;
- cond.wakeAll();
- }
- }
-};
-
-template <class Mutex, class Locker>
-void oscillate(unsigned long timeout) {
-
- OscillateThread<Mutex, Locker> thrd[threadCount];
- Mutex m;
- for (int i = 0; i < threadCount; ++i) {
- thrd[i].mutex = &m;
- thrd[i].m_threadid = i;
- thrd[i].timeout = timeout;
- }
-
- QBENCHMARK {
- for (int i = 0; i < threadCount; ++i) {
- thrd[i].start();
- }
- for (int i = 0; i < threadCount; ++i) {
- thrd[i].wait();
- }
- }
-
-}
-
-void tst_QWaitCondition::oscillate_mutex_data()
-{
- QTest::addColumn<unsigned long>("timeout");
-
- QTest::newRow("0") << 0ul;
- QTest::newRow("1") << 1ul;
- QTest::newRow("1000") << 1000ul;
- QTest::newRow("forever") << ULONG_MAX;
-}
-
-void tst_QWaitCondition::oscillate_mutex()
-{
- QFETCH(unsigned long, timeout);
- oscillate<QMutex, QMutexLocker>(timeout);
-}
-
-void tst_QWaitCondition::oscillate_writelock_data()
-{
- oscillate_mutex_data();
-}
-
-void tst_QWaitCondition::oscillate_writelock()
-{
- QFETCH(unsigned long, timeout);
- oscillate<QReadWriteLock, QWriteLocker>(timeout);
-}
-
-
-QTEST_MAIN(tst_QWaitCondition)
-#include "tst_qwaitcondition.moc"