feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Utils: Make Benchmarker log to a configurable loggingcategory

Browse Source 
Change-Id: I2bb6b42af775827dae1c1cc41f9dabf63edf58e7
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Tobias Hunger
2017-09-29 11:52:51 +02:00
parent f56b2bfe6d
commit b41cf10d71
2 changed files with 30 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/libs/utils/benchmarker.cpp
View File

@@ -33,6 +33,13 @@ namespace Utils {
Benchmarker::Benchmarker(const QString &testsuite, const QString &testcase, Benchmarker::Benchmarker(const QString &testsuite, const QString &testcase,
const QString &tagData) : const QString &tagData) :
Benchmarker(benchmarksLog(), testsuite, testcase, tagData)
{ }
Benchmarker::Benchmarker(const QLoggingCategory &cat,
const QString &testsuite, const QString &testcase,
const QString &tagData) :
m_category(cat),
m_tagData(tagData), m_tagData(tagData),
m_testsuite(testsuite), m_testsuite(testsuite),
m_testcase(testcase) m_testcase(testcase)
@@ -49,17 +56,23 @@ Benchmarker::~Benchmarker()
void Benchmarker::report(qint64 ms) void Benchmarker::report(qint64 ms)
{ {
m_timer.invalidate(); m_timer.invalidate();
report(m_testsuite, m_testcase, ms, m_tagData); report(m_category, m_testsuite, m_testcase, ms, m_tagData);
} }
void Benchmarker::report(const QString &testsuite, const QString &testcase, qint64 ms, void Benchmarker::report(const QString &testsuite,
const QString &tags) const QString &testcase, qint64 ms, const QString &tags)
{
report(benchmarksLog(), testsuite, testcase, ms, tags);
}
void Benchmarker::report(const QLoggingCategory &cat, const QString &testsuite, const QString &testcase,
qint64 ms, const QString &tags)
{ {
QString t = "unit=ms"; QString t = "unit=ms";
if (!tags.isEmpty()) if (!tags.isEmpty())
t += "," + tags; t += "," + tags;
qCDebug(benchmarksLog, "%s::%s: %lld { %s }", qCDebug(cat, "%s::%s: %lld { %s }",
testsuite.toUtf8().data(), testcase.toUtf8().data(), ms, t.toUtf8().data()); testsuite.toUtf8().data(), testcase.toUtf8().data(), ms, t.toUtf8().data());
} }

16
src/libs/utils/benchmarker.h
View File

@@ -30,20 +30,30 @@
#include <QString> #include <QString>
#include <QElapsedTimer> #include <QElapsedTimer>
QT_BEGIN_NAMESPACE
class QLoggingCategory;
QT_END_NAMESPACE
namespace Utils { namespace Utils {
class QTCREATOR_UTILS_EXPORT Benchmarker class QTCREATOR_UTILS_EXPORT Benchmarker
{ {
public: public:
Benchmarker(const QString &testsuite, const QString &testcase, Benchmarker(const QString &testsuite, const QString &testcase,
const QString &tags = QString()); const QString &tagData = QString());
Benchmarker(const QLoggingCategory &cat, const QString &testsuite, const QString &testcase,
const QString &tagData = QString());
~Benchmarker(); ~Benchmarker();
void report(qint64 ms); void report(qint64 ms);
static void report(const QString &testsuite, const QString &testcase, qint64 ms, static void report(const QString &testsuite, const QString &testcase,
const QString &tags = QString()); qint64 ms, const QString &tags = QString());
static void report(const QLoggingCategory &cat,
const QString &testsuite, const QString &testcase,
qint64 ms, const QString &tags = QString());
private: private:
const QLoggingCategory &m_category;
QElapsedTimer m_timer; QElapsedTimer m_timer;
QString m_tagData; QString m_tagData;
QString m_testsuite; QString m_testsuite;