AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Convert QLocalSocket benchmark to use QTestEventLoop

Browse Source 
Now that this event loop pays attention to test failures, we can avoid
the time-outs that used to happen on test failure. Also check for
premature failures (but don't return early, so we can shut down the
server gracefully) and give the event-loops sensible time-outs.

Task-number: QTBUG-91713
Change-Id: Ib895a5fba0f22654c7fecf996f23649a4b5ce0de
Reviewed-by: Alex Trotsenko <alex1973tr@gmail.com>
This commit is contained in:
Edward Welbourne 2021-07-13 14:21:01 +02:00
parent ebae6e2041
commit 328f22561d
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
tests/benchmarks/network/socket/qlocalsocket/tst_qlocalsocket.cpp
View File

@ -28,11 +28,12 @@
****************************************************************************/ ****************************************************************************/
#include <QTest> #include <QTest>
#include <QtTest/qtesteventloop.h>
#include <QtCore/qglobal.h> #include <QtCore/qglobal.h>
#include <QtCore/qthread.h> #include <QtCore/qthread.h>
#include <QtCore/qsemaphore.h> #include <QtCore/qsemaphore.h>
#include <QtCore/qbytearray.h> #include <QtCore/qbytearray.h>
#include <QtCore/qeventloop.h>
#include <QtCore/qvector.h> #include <QtCore/qvector.h>
#include <QtCore/qelapsedtimer.h> #include <QtCore/qelapsedtimer.h>
#include <QtNetwork/qlocalsocket.h> #include <QtNetwork/qlocalsocket.h>
@ -152,7 +153,7 @@ void tst_QLocalSocket::pingPong()
QVERIFY(serverThread.running.tryAcquire(1, 3000)); QVERIFY(serverThread.running.tryAcquire(1, 3000));
SocketFactory factory(1, connections); SocketFactory factory(1, connections);
QEventLoop eventLoop; QTestEventLoop eventLoop;
QVector<qint64> bytesToRead; QVector<qint64> bytesToRead;
QElapsedTimer timer; QElapsedTimer timer;
@ -163,15 +164,20 @@ void tst_QLocalSocket::pingPong()
if (--bytesToRead[channel] == 0 && --connections == 0) { if (--bytesToRead[channel] == 0 && --connections == 0) {
factory.stopped = true; factory.stopped = true;
eventLoop.quit(); eventLoop.exitLoop();
} }
}); });
timer.start(); timer.start();
emit factory.start(); emit factory.start();
eventLoop.exec(); // QtTestLib's Watchdog defaults to 300 seconds; we want to give up before
// it bites.
eventLoop.enterLoop(290);
qDebug("Elapsed time: %.1f s", timer.elapsed() / 1000.0); if (eventLoop.timeout())
qDebug("Timed out after %.1f s", timer.elapsed() / 1000.0);
else if (!QTest::currentTestFailed())
qDebug("Elapsed time: %.1f s", timer.elapsed() / 1000.0);
serverThread.quit(); serverThread.quit();
serverThread.wait(); serverThread.wait();
} }
@ -202,7 +208,7 @@ void tst_QLocalSocket::dataExchange()
QVERIFY(serverThread.running.tryAcquire(1, 3000)); QVERIFY(serverThread.running.tryAcquire(1, 3000));
SocketFactory factory(chunkSize, connections); SocketFactory factory(chunkSize, connections);
QEventLoop eventLoop; QTestEventLoop eventLoop;
qint64 totalReceived = 0; qint64 totalReceived = 0;
QElapsedTimer timer; QElapsedTimer timer;
@ -213,15 +219,16 @@ void tst_QLocalSocket::dataExchange()
totalReceived += bytes; totalReceived += bytes;
if (timer.elapsed() >= timeToTest) { if (timer.elapsed() >= timeToTest) {
factory.stopped = true; factory.stopped = true;
eventLoop.quit(); eventLoop.exitLoop();
} }
}); });
timer.start(); timer.start();
emit factory.start(); emit factory.start();
eventLoop.exec(); eventLoop.enterLoopMSecs(timeToTest * 2);
qDebug("Transfer rate: %.1f MB/s", totalReceived / 1048.576 / timer.elapsed()); if (!QTest::currentTestFailed())
qDebug("Transfer rate: %.1f MB/s", totalReceived / 1048.576 / timer.elapsed());
serverThread.quit(); serverThread.quit();
serverThread.wait(); serverThread.wait();
} }