feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Valgrind: Refactor Parser

Browse Source 
Make it implicitly threaded.

Get rid of ThreadedParser.

Don't move QTcpSocket instances, received by
QTcpServer::nextPendingConnection(), into another thread,
as docs says it's not safe.

Use wait condition for waiting for new data.

Don't potentially leak the Parser in loadXmlLogFile():
store a unique pointer to the running parser.

Introduce Parser::setData() method and use it with
QFile device in loadXmlLogFile().

Pass QAbstractSocket into the parser instead of
QIODevice and get rid of downcasting. The QIODevice
couldn't really work with non-socket and non-file devices
(like e.g. QProcess), as it lacks general error and finished
reporting signals (it has only general readyRead() signal).

Change-Id: I9352aec694564d4d2a26898841ed964bed470d82
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2023-08-09 12:40:40 +02:00
parent 3ab2da691d
commit 5bce234986
13 changed files with 389 additions and 399 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/plugins/valgrind/valgrindmemcheckparsertest.cpp
View File

@@ -249,8 +249,8 @@ void ValgrindMemcheckParserTest::testHelgrindSample1()
Parser parser;
Recorder rec(&parser);
parser.setIODevice(m_socket.release());
parser.start();
parser.setSocket(m_socket.release());
parser.runBlocking();
m_process->waitForFinished();
QCOMPARE(m_process->exitStatus(), QProcess::NormalExit);
@@ -258,7 +258,7 @@ void ValgrindMemcheckParserTest::testHelgrindSample1()
QVERIFY2(parser.errorString().isEmpty(), qPrintable(parser.errorString()));
const QList<Error> actualErrors = rec.errors;
QVERIFY(!actualErrors.isEmpty());
if (actualErrors.first() != expectedErrors.first()) {
dumpError(actualErrors.first());
dumpError(expectedErrors.first());
@@ -324,8 +324,8 @@ void ValgrindMemcheckParserTest::testMemcheckSample1()
Parser parser;
Recorder rec(&parser);
parser.setIODevice(m_socket.release());
parser.start();
parser.setSocket(m_socket.release());
parser.runBlocking();
m_process->waitForFinished();
QCOMPARE(m_process->exitStatus(), QProcess::NormalExit);
@@ -333,7 +333,7 @@ void ValgrindMemcheckParserTest::testMemcheckSample1()
QVERIFY2(parser.errorString().isEmpty(), qPrintable(parser.errorString()));
const QList<Error> actualErrors = rec.errors;
QVERIFY(!actualErrors.isEmpty());
if (actualErrors.first() != expectedErrors.first()) {
dumpError(actualErrors.first());
dumpError(expectedErrors.first());
@@ -358,8 +358,8 @@ void ValgrindMemcheckParserTest::testMemcheckSample2()
Parser parser;
Recorder rec(&parser);
parser.setIODevice(m_socket.release());
parser.start();
parser.setSocket(m_socket.release());
parser.runBlocking();
m_process->waitForFinished();
QCOMPARE(m_process->exitStatus(), QProcess::NormalExit);
@@ -387,8 +387,8 @@ void ValgrindMemcheckParserTest::testMemcheckSample3()
Parser parser;
Recorder rec(&parser);
parser.setIODevice(m_socket.release());
parser.start();
parser.setSocket(m_socket.release());
parser.runBlocking();
m_process->waitForFinished();
QCOMPARE(m_process->exitStatus(), QProcess::NormalExit);
@@ -443,8 +443,8 @@ void ValgrindMemcheckParserTest::testMemcheckCharm()
Parser parser;
Recorder rec(&parser);
parser.setIODevice(m_socket.release());
parser.start();
parser.setSocket(m_socket.release());
parser.runBlocking();
m_process->waitForFinished();
QCOMPARE(m_process->exitStatus(), QProcess::NormalExit);
@@ -460,8 +460,8 @@ void ValgrindMemcheckParserTest::testValgrindCrash()
initTest(dataFile("memcheck-output-sample1.xml"), QStringList("--crash"));
Parser parser;
parser.setIODevice(m_socket.release());
parser.start();
parser.setSocket(m_socket.release());
parser.runBlocking();
m_process->waitForFinished();
QCOMPARE(m_process->state(), QProcess::NotRunning);
QCOMPARE(m_process->exitStatus(), QProcess::CrashExit);
@@ -474,8 +474,8 @@ void ValgrindMemcheckParserTest::testValgrindGarbage()
initTest(dataFile("memcheck-output-sample1.xml"), QStringList("--garbage"));
Parser parser;
parser.setIODevice(m_socket.release());
parser.start();
parser.setSocket(m_socket.release());
parser.runBlocking();
m_process->waitForFinished();
QCOMPARE(m_process->state(), QProcess::NotRunning);
QCOMPARE(m_process->exitStatus(), QProcess::NormalExit);