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

Use %.6g rather than %s and QByteArray::number()

Browse Source 
The comment against the use of this claimed qvsnprintf() lacks 64-bit
support, which is probably untrue by now but certainly irrelevant as
the value being formatted is a qreal, not a 64-bit integral type.
Since %g wants a double, make the value passed explicitly double by
casting its denominator. Casting its numerator to qreal was
superfluous as that's its type already.

Change-Id: I5ff885fbeb9b638b2b0507061e0a19e3b8522143
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
This commit is contained in:
Edward Welbourne 2021-09-30 12:52:15 +02:00
parent 09fd398959
commit f8a5bb3c32
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/testlib/qxmltestlogger.cpp
View File

@ -198,7 +198,7 @@ static const char *incidentFormatString(bool noDescription, bool noTag)
static const char *benchmarkResultFormatString() static const char *benchmarkResultFormatString()
{ {
return "<BenchmarkResult metric=\"%s\" tag=\"%s\" value=\"%s\" iterations=\"%d\" />\n"; return "<BenchmarkResult metric=\"%s\" tag=\"%s\" value=\"%.6g\" iterations=\"%d\" />\n";
} }
static const char *messageFormatString(bool noDescription, bool noTag) static const char *messageFormatString(bool noDescription, bool noTag)
@ -266,13 +266,12 @@ void QXmlTestLogger::addBenchmarkResult(const QBenchmarkResult &result)
benchmarkMetricName(result.metric)); benchmarkMetricName(result.metric));
xmlQuote(&quotedTag, result.context.tag.toUtf8().constData()); xmlQuote(&quotedTag, result.context.tag.toUtf8().constData());
const qreal valuePerIteration = qreal(result.value) / qreal(result.iterations);
QTest::qt_asprintf( QTest::qt_asprintf(
&buf, &buf,
QTest::benchmarkResultFormatString(), QTest::benchmarkResultFormatString(),
quotedMetric.constData(), quotedMetric.constData(),
quotedTag.constData(), quotedTag.constData(),
QByteArray::number(valuePerIteration).constData(), //no 64-bit qsnprintf support result.value / double(result.iterations),
result.iterations); result.iterations);
outputString(buf.constData()); outputString(buf.constData());
} }