1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix calls to non-started QElapsedTimer functions

Browse Source 
It's illegal to call elapsed() or restart() (sic) on a non-started
QElapsedTimer, so don't do that. In QNAM code, this has been observed by
adding assertions into QElapsedTimer, which then make network tests
crash. (While I am unable to run the network testsuite, this is
reproducible locally by running tst_QNetworkDiskCache::setCookieHeader).

The QTextStream test also calls restart() without a start(), but then it
calls elapsed()+start() which is the whole point of restart(), so amend
accordingly.

Pick-to: 6.8 6.5
Change-Id: I5cfe308f64b631b68b92843b409777a6b9176828
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit 585471b138b195cb9020200cae760f119903df85)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Giuseppe D'Angelo 2025-03-14 15:31:48 +01:00 committed by Qt Cherry-pick Bot
parent a6795882d8
commit 06b02f003e
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/network/access/qnetworkreplyhttpimpl.cpp
View File

@ -1168,7 +1168,8 @@ void QNetworkReplyHttpImplPrivate::replyDownloadData(QByteArray d)
emit q->readyRead(); emit q->readyRead();
// emit readyRead before downloadProgress in case this will cause events to be // emit readyRead before downloadProgress in case this will cause events to be
// processed and we get into a recursive call (as in QProgressDialog). // processed and we get into a recursive call (as in QProgressDialog).
if (downloadProgressSignalChoke.elapsed() >= progressSignalInterval if (downloadProgressSignalChoke.isValid() &&
downloadProgressSignalChoke.elapsed() >= progressSignalInterval
&& (!decompressHelper.isValid() || decompressHelper.isCountingBytes())) { && (!decompressHelper.isValid() || decompressHelper.isCountingBytes())) {
downloadProgressSignalChoke.restart(); downloadProgressSignalChoke.restart();
emit q->downloadProgress(bytesDownloaded, totalSizeOpt.value_or(-1)); emit q->downloadProgress(bytesDownloaded, totalSizeOpt.value_or(-1));
@ -1501,7 +1502,8 @@ void QNetworkReplyHttpImplPrivate::replyDownloadProgressSlot(qint64 bytesReceive
// processed and we get into a recursive call (as in QProgressDialog). // processed and we get into a recursive call (as in QProgressDialog).
if (bytesDownloaded > 0) if (bytesDownloaded > 0)
emit q->readyRead(); emit q->readyRead();
if (downloadProgressSignalChoke.elapsed() >= progressSignalInterval) { if (downloadProgressSignalChoke.isValid() &&
downloadProgressSignalChoke.elapsed() >= progressSignalInterval) {
downloadProgressSignalChoke.restart(); downloadProgressSignalChoke.restart();
emit q->downloadProgress(bytesDownloaded, bytesTotal); emit q->downloadProgress(bytesDownloaded, bytesTotal);
} }
@ -1938,7 +1940,8 @@ void QNetworkReplyHttpImplPrivate::_q_cacheLoadReadyRead()
// This readyRead() goes to the user. The user then may or may not read() anything. // This readyRead() goes to the user. The user then may or may not read() anything.
emit q->readyRead(); emit q->readyRead();
if (downloadProgressSignalChoke.elapsed() >= progressSignalInterval) { if (downloadProgressSignalChoke.isValid() &&
downloadProgressSignalChoke.elapsed() >= progressSignalInterval) {
downloadProgressSignalChoke.restart(); downloadProgressSignalChoke.restart();
emit q->downloadProgress(bytesDownloaded, totalSizeOpt.value_or(-1)); emit q->downloadProgress(bytesDownloaded, totalSizeOpt.value_or(-1));
} }

10
tests/auto/corelib/serialization/qtextstream/tst_qtextstream.cpp
View File

@ -985,7 +985,7 @@ void tst_QTextStream::performance()
}; };
int elapsed[N] = {0, 0, 0}; int elapsed[N] = {0, 0, 0};
stopWatch.restart(); stopWatch.start();
int nlines1 = 0; int nlines1 = 0;
QFile file(m_rfc3261FilePath); QFile file(m_rfc3261FilePath);
QVERIFY(file.open(QFile::ReadOnly)); QVERIFY(file.open(QFile::ReadOnly));
@ -995,8 +995,7 @@ void tst_QTextStream::performance()
file.readLine(); file.readLine();
} }
elapsed[0] = stopWatch.elapsed(); elapsed[0] = stopWatch.restart();
stopWatch.restart();
int nlines2 = 0; int nlines2 = 0;
QFile file2(m_rfc3261FilePath); QFile file2(m_rfc3261FilePath);
@ -1008,8 +1007,7 @@ void tst_QTextStream::performance()
stream.readLine(); stream.readLine();
} }
elapsed[1] = stopWatch.elapsed(); elapsed[1] = stopWatch.restart();
stopWatch.restart();
int nlines3 = 0; int nlines3 = 0;
QFile file3(m_rfc3261FilePath); QFile file3(m_rfc3261FilePath);
@ -1020,7 +1018,7 @@ void tst_QTextStream::performance()
while (stream2.readLineInto(&line)) while (stream2.readLineInto(&line))
++nlines3; ++nlines3;
elapsed[2] = stopWatch.elapsed(); elapsed[2] = stopWatch.restart();
QCOMPARE(nlines1, nlines2); QCOMPARE(nlines1, nlines2);
QCOMPARE(nlines2, nlines3); QCOMPARE(nlines2, nlines3);