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

QMessagePattern: merge and improve %{time}-printing code

Browse Source 
All modern compilers implement divisions and modulus via multiplications
and shift, so the codegen is practically the same (three multiplications
in total). But the new code allows more than 136 years of uptime (49710
days).

Drive-by fix indentation in nearby line.

Pick-to: 6.9
Change-Id: Iea806bd7dfac1f852c66fffd41c2ac6660e7cc65
Reviewed-by: Ahmad Samir <a.samirh78@gmail.com>
This commit is contained in:
Thiago Macieira 2025-01-07 23:58:13 -03:00
parent 9dc294143d
commit 61924c622a
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/corelib/global/qlogging.cpp
View File

@ -1674,20 +1674,24 @@ static QString formatLogMessage(QtMsgType type, const QMessageLogContext &contex
#endif
} else if (token == timeTokenC) {
using namespace std::chrono;
auto formatElapsedTime = [](steady_clock::duration time) {
// we assume time > 0
auto ms = duration_cast<milliseconds>(time);
auto sec = duration_cast<seconds>(ms);
ms -= sec;
return QString::asprintf("%6lld.%03u", qint64(sec.count()), uint(ms.count()));
};
QString timeFormat = pattern->timeArgs.at(timeArgsIdx);
timeArgsIdx++;
if (timeFormat == "process"_L1) {
auto elapsed = steady_clock::now() - pattern->appStartTime;
quint64 ms = duration_cast<milliseconds>(elapsed).count();
message.append(QString::asprintf("%6d.%03d", uint(ms / 1000), uint(ms % 1000)));
message += formatElapsedTime(steady_clock::now() - pattern->appStartTime);
} else if (timeFormat == "boot"_L1) {
// just print the milliseconds since the elapsed timer reference
// like the Linux kernel does
qint64 ms = duration_cast<milliseconds>(steady_clock::now().time_since_epoch()).count();
message.append(QString::asprintf("%6d.%03d", uint(ms / 1000), uint(ms % 1000)));
message += formatElapsedTime(steady_clock::now().time_since_epoch());
#if QT_CONFIG(datestring)
} else if (timeFormat.isEmpty()) {
message.append(QDateTime::currentDateTime().toString(Qt::ISODate));
message.append(QDateTime::currentDateTime().toString(Qt::ISODate));
} else {
message.append(QDateTime::currentDateTime().toString(timeFormat));
#endif // QT_CONFIG(datestring)