diff options
author | Christian Kandeler <christian.kandeler@qt.io> | 2016-10-05 13:29:00 +0200 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@qt.io> | 2016-10-10 08:28:53 +0000 |
commit | b2b9d77f5cdfbb5ed19554e2d424b5be75ef8e73 (patch) | |
tree | 78590fea5630b3e2393666c961ed95b1f2f9ec3b /src/lib/corelib/logging | |
parent | f2648d82ee1ff9e42bf3a41e10fccc10acbe80d5 (diff) |
Time more operations
Change-Id: I1aa46693cb71fe284083ee5305ce2650de1307ac
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'src/lib/corelib/logging')
-rw-r--r-- | src/lib/corelib/logging/logger.cpp | 52 | ||||
-rw-r--r-- | src/lib/corelib/logging/logger.h | 13 |
2 files changed, 0 insertions, 65 deletions
diff --git a/src/lib/corelib/logging/logger.cpp b/src/lib/corelib/logging/logger.cpp index 9a7811fb5..7aadd785b 100644 --- a/src/lib/corelib/logging/logger.cpp +++ b/src/lib/corelib/logging/logger.cpp @@ -43,8 +43,6 @@ #include "logger.h" -#include "translator.h" - #include <QByteArray> #include <QElapsedTimer> #include <QMutex> @@ -227,55 +225,5 @@ LogWriter Logger::qbsLog(LoggerLevel level, bool force) const return LogWriter(m_logSink, level, force); } - -class TimedActivityLogger::TimedActivityLoggerPrivate -{ -public: - Logger logger; - QString activity; - QElapsedTimer timer; -}; - -TimedActivityLogger::TimedActivityLogger(const Logger &logger, const QString &activity, - bool enabled) - : d(0) -{ - if (!enabled) - return; - d = new TimedActivityLoggerPrivate; - d->logger = logger; - d->activity = activity; - d->logger.qbsLog(LoggerInfo) << Tr::tr("Starting activity '%2'.").arg(activity); - d->timer.start(); -} - -void TimedActivityLogger::finishActivity() -{ - if (!d) - return; - qint64 ms = d->timer.elapsed(); - qint64 s = ms/1000; - ms -= s*1000; - qint64 m = s/60; - s -= m*60; - const qint64 h = m/60; - m -= h*60; - QString timeString = QString::fromLocal8Bit("%1ms").arg(ms); - if (h || m || s) - timeString.prepend(QString::fromLocal8Bit("%1s, ").arg(s)); - if (h || m) - timeString.prepend(QString::fromLocal8Bit("%1m, ").arg(m)); - if (h) - timeString.prepend(QString::fromLocal8Bit("%1h, ").arg(h)); - d->logger.qbsLog(LoggerInfo) << Tr::tr("Activity '%2' took %3.").arg(d->activity, timeString); - delete d; - d = 0; -} - -TimedActivityLogger::~TimedActivityLogger() -{ - finishActivity(); -} - } // namespace Internal } // namespace qbs diff --git a/src/lib/corelib/logging/logger.h b/src/lib/corelib/logging/logger.h index e587f8325..ef35198be 100644 --- a/src/lib/corelib/logging/logger.h +++ b/src/lib/corelib/logging/logger.h @@ -134,19 +134,6 @@ private: bool m_storeWarnings = false; }; - -class TimedActivityLogger -{ -public: - TimedActivityLogger(const Logger &logger, const QString &activity, bool enabled); - void finishActivity(); - ~TimedActivityLogger(); - -private: - class TimedActivityLoggerPrivate; - TimedActivityLoggerPrivate *d; -}; - } // namespace Internal } // namespace qbs |