qiurui
/
qtbase
mirror of https://github.com/qt/qtbase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tst_QThread: use QLatch in multiThreadWait 

Instead of a hand-rolled Barrier class.

Task-number: QTBUG-139617
Change-Id: I116d689adda1606b70e9fffdf8abbc0b3a9bfcad
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
This commit is contained in:
Thiago Macieira 2025-09-04 10:30:17 -07:00
parent 9e2b6e5d9c
commit 20881debeb
1 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tests/auto/corelib/thread/qthread/tst_qthread.cpp
View File

@ -19,6 +19,7 @@
#include <qdebug.h> #include <qdebug.h>
#include <qmetaobject.h> #include <qmetaobject.h>
#include <qscopeguard.h> #include <qscopeguard.h>
#include <private/qlatch_p.h>
#include <private/qobject_p.h> #include <private/qobject_p.h>
#include <private/qthread_p.h> #include <private/qthread_p.h>
@ -1190,23 +1191,6 @@ void tst_QThread::wait3_slowDestructor()
QVERIFY(thread.wait(one_minute)); QVERIFY(thread.wait(one_minute));
} }
class Barrier
{
std::mutex mtx;
std::condition_variable cnd;
int current;
public:
Barrier(int target) : current(target) {}
void arriveAndWait()
{
std::unique_lock l(mtx);
if (--current)
cnd.wait(l);
else
cnd.notify_all();
}
};
void tst_QThread::multiThreadWait_data() void tst_QThread::multiThreadWait_data()
{ {
QTest::addColumn<QList<int>>("deadlines"); QTest::addColumn<QList<int>>("deadlines");
@ -1308,7 +1292,7 @@ void tst_QThread::multiThreadWait()
// the expected runtime of the test (2s vs ~10 ms). // the expected runtime of the test (2s vs ~10 ms).
class WaiterThread : public QThread { class WaiterThread : public QThread {
public: public:
Barrier *barrier; QLatch *barrier;
QSemaphore *endSema; QSemaphore *endSema;
QThread *target; QThread *target;
QDeadlineTimer deadline; QDeadlineTimer deadline;
@ -1332,7 +1316,7 @@ void tst_QThread::multiThreadWait()
TargetThread target; TargetThread target;
target.start(); target.start();
Barrier barrier(deadlines.size() + 1); // plus the main thread QLatch barrier(deadlines.size() + 1); // plus the main thread
QSemaphore timeoutSema, successSema; QSemaphore timeoutSema, successSema;
std::array<std::unique_ptr<WaiterThread>, 5> threads; // 5 threads is enough std::array<std::unique_ptr<WaiterThread>, 5> threads; // 5 threads is enough
int expectedTimeoutCount = 0; int expectedTimeoutCount = 0;