whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tst_qxmlsimplereader::inputFromSocket - fix race condition(s) 

This test was failing recently on Windows 7, mingw, x86. It's not
failing now and attempts to reproduce the failure on CI's VM were
unsuccessful. Anyway, just reading the code is enough to spot
race-conditions: two threads are accessing two shared boolean
variables without any protection.

It's unclear if these races were the reason why the test was failing,
but we fix them for good anyway. Also, a failure to start a thread
or to start listening on a TCP socket is not treated as XML-related
failure anymore and QSKIPped instead.

Change-Id: I5115ce6c33cafc91485f8cf6e7e268d954976556
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
bb10
Timur Pocheptsov 2017-11-03 12:02:12 +01:00
parent 2937ab9e32
commit 28937559b1
1 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
tests/auto/xml/sax/qxmlsimplereader/tst_qxmlsimplereader.cpp
View File

@ -32,6 +32,8 @@
#include <qtcpserver.h>
#include <qtcpsocket.h>
#include <QtTest/QtTest>
#include <QtCore/qatomic.h>
#include <QtCore/qsemaphore.h>
#include <qfile.h>
#include <qstring.h>
#include <qdir.h>
@ -47,10 +49,11 @@ class XmlServer : public QThread
{
Q_OBJECT
public:
XmlServer(QObject *parent = 0) : QThread(parent), quit_soon(false), listening(false) {}
XmlServer(QObject *parent = 0) : QThread(parent) {}
bool quit_soon;
bool listening;
QSemaphore threadStarted;
bool listening = false;
QAtomicInt quitSoon;
protected:
virtual void run();
@ -63,6 +66,8 @@ void XmlServer::run()
QTcpServer srv;
listening = srv.listen(QHostAddress::Any, TEST_PORT);
threadStarted.release();
if (!listening) {
qWarning() << "Failed to listen on" << TEST_PORT << srv.errorString();
return;
@ -95,14 +100,13 @@ void XmlServer::run()
QByteArray data = file.readAll();
for (int i = 0; i < data.size();) {
// sock->putChar(data.at(i));
int cnt = qMin(CHUNK_SIZE, data.size() - i);
sock->write(data.constData() + i, cnt);
i += cnt;
sock->flush();
QTest::qSleep(1);
if (quit_soon) {
if (quitSoon.loadAcquire()) {
sock->abort();
break;
}
@ -112,7 +116,7 @@ void XmlServer::run()
delete sock;
}
if (quit_soon)
if (quitSoon.loadAcquire())
break;
}
@ -162,7 +166,7 @@ tst_QXmlSimpleReader::tst_QXmlSimpleReader() : server(new XmlServer(this))
tst_QXmlSimpleReader::~tst_QXmlSimpleReader()
{
server->quit_soon = true;
server->quitSoon.storeRelease(1);
server->wait();
}
@ -562,7 +566,19 @@ void tst_QXmlSimpleReader::inputFromSocket()
QSKIP("WinRT does not support connecting to localhost");
#endif
QTRY_VERIFY_WITH_TIMEOUT(server->listening, 15000);
if (!server->threadStarted.tryAcquire(1, 15000)) {
// If something is wrong with QThreads, it's not a reason to fail
// XML-test, we are not testing QThread here after all!
QSKIP("XmlServer/thread has not started yet");
}
// Subsequent runs should be able to acquire the semaphore.
server->threadStarted.release(1);
if (!server->listening) {
// Again, QTcpServer is not the subject of this test!
QSKIP("QTcpServer::listen failed, bailing out");
}
QTcpSocket sock;
sock.connectToHost(QHostAddress::LocalHost, TEST_PORT);