diff options
| author | Antti Määttä <antti.maatta@qt.io> | 2023-05-09 08:49:34 +0300 |
|---|---|---|
| committer | Antti Määttä <antti.maatta@qt.io> | 2023-05-17 11:00:55 +0300 |
| commit | 4dd9a276402505ff9730b951862084eccf472bc0 (patch) | |
| tree | 4bbc09b7249459c15760acca4d3e2c2be503bc1f | |
| parent | 8712e35aec2c072fe709364eaa69bb8928c5cacc (diff) | |
| download | qtbase-4dd9a276402505ff9730b951862084eccf472bc0.tar.gz | |
CTF: Use UTC date-time in metadata
Force UTC date-time and use ISO date-time. Also isMonotonic is
always true so the conditionals can be removed.
Change-Id: I7419d62ee7a526c3c6d4b7628d52d45b601e84d6
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| -rw-r--r-- | src/plugins/tracing/qctflib.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/plugins/tracing/qctflib.cpp b/src/plugins/tracing/qctflib.cpp index bfbe6b2d87..f0bc001456 100644 --- a/src/plugins/tracing/qctflib.cpp +++ b/src/plugins/tracing/qctflib.cpp @@ -102,17 +102,17 @@ QCtfLibImpl::QCtfLibImpl() } m_session.all = m_session.tracepoints.contains(QStringLiteral("all")); - auto datetime = QDateTime::currentDateTime(); - QString mhn = QSysInfo::machineHostName(); + auto datetime = QDateTime::currentDateTime().toUTC(); + const QString mhn = QSysInfo::machineHostName(); QString metadata = QString::fromUtf8(traceMetadataTemplate, traceMetadataSize); metadata.replace(QStringLiteral("$TRACE_UUID"), s_TraceUuid.toString(QUuid::WithoutBraces)); metadata.replace(QStringLiteral("$ARC_BIT_WIDTH"), QString::number(Q_PROCESSOR_WORDSIZE * 8)); metadata.replace(QStringLiteral("$SESSION_NAME"), m_session.name); - metadata.replace(QStringLiteral("$CREATION_TIME"), datetime.toString()); + metadata.replace(QStringLiteral("$CREATION_TIME"), datetime.toString(Qt::ISODate)); metadata.replace(QStringLiteral("$HOST_NAME"), mhn); - metadata.replace(QStringLiteral("$CLOCK_FREQUENCY"), m_timer.isMonotonic() ? QStringLiteral("1000000000") : QStringLiteral("1000")); - metadata.replace(QStringLiteral("$CLOCK_NAME"), m_timer.isMonotonic() ? QStringLiteral("monotonic") : QStringLiteral("system")); - metadata.replace(QStringLiteral("$CLOCK_TYPE"), m_timer.isMonotonic() ? QStringLiteral("Monotonic clock") : QStringLiteral("System clock")); + metadata.replace(QStringLiteral("$CLOCK_FREQUENCY"), QStringLiteral("1000000000")); + metadata.replace(QStringLiteral("$CLOCK_NAME"), QStringLiteral("monotonic")); + metadata.replace(QStringLiteral("$CLOCK_TYPE"), QStringLiteral("Monotonic clock")); metadata.replace(QStringLiteral("$CLOCK_OFFSET"), QString::number(datetime.toMSecsSinceEpoch() * 1000000)); #if Q_BYTE_ORDER == Q_BIG_ENDIAN metadata.replace(QStringLiteral("$ENDIANNESS"), QStringLiteral("be")); @@ -120,7 +120,6 @@ QCtfLibImpl::QCtfLibImpl() metadata.replace(QStringLiteral("$ENDIANNESS"), QStringLiteral("le")); #endif writeMetadata(metadata, true); - m_timer.start(); } |