From 2dfa85df6cf46dc2a5ee0c6bf69aa030b19a8435 Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Tue, 1 Dec 2015 21:55:58 +0100 Subject: Use hawd for dummyresourcebenchmark --- hawd_defs/dummy_query_by_uid | 8 ++++++++ hawd_defs/dummy_write_in_process | 9 +++++++++ hawd_defs/dummy_write_to_facade | 9 +++++++++ tests/dummyresourcebenchmark.cpp | 38 +++++++++++++++++++++++++++++++------- 4 files changed, 57 insertions(+), 7 deletions(-) create mode 100644 hawd_defs/dummy_query_by_uid create mode 100644 hawd_defs/dummy_write_in_process create mode 100644 hawd_defs/dummy_write_to_facade diff --git a/hawd_defs/dummy_query_by_uid b/hawd_defs/dummy_query_by_uid new file mode 100644 index 0000000..317b1e3 --- /dev/null +++ b/hawd_defs/dummy_query_by_uid @@ -0,0 +1,8 @@ +{ + "name": "Dummy read performance", + "description": "Measures performance of the query system by reading by uid", + "columns": [ + { "name": "rows", "type": "int" }, + { "name": "read", "type": "float", "unit": "ops/ms" } + ] +} diff --git a/hawd_defs/dummy_write_in_process b/hawd_defs/dummy_write_in_process new file mode 100644 index 0000000..5f0a3e6 --- /dev/null +++ b/hawd_defs/dummy_write_in_process @@ -0,0 +1,9 @@ +{ + "name": "In process write using DummyResource", + "description": "Measures performance of the DummyResource class", + "columns": [ + { "name": "rows", "type": "int" }, + { "name": "append", "type": "float", "unit": "ops/ms" }, + { "name": "total", "type": "float", "unit": "ops/ms" } + ] +} diff --git a/hawd_defs/dummy_write_to_facade b/hawd_defs/dummy_write_to_facade new file mode 100644 index 0000000..5f0a3e6 --- /dev/null +++ b/hawd_defs/dummy_write_to_facade @@ -0,0 +1,9 @@ +{ + "name": "In process write using DummyResource", + "description": "Measures performance of the DummyResource class", + "columns": [ + { "name": "rows", "type": "int" }, + { "name": "append", "type": "float", "unit": "ops/ms" }, + { "name": "total", "type": "float", "unit": "ops/ms" } + ] +} diff --git a/tests/dummyresourcebenchmark.cpp b/tests/dummyresourcebenchmark.cpp index 94a4e72..ae15b9c 100644 --- a/tests/dummyresourcebenchmark.cpp +++ b/tests/dummyresourcebenchmark.cpp @@ -11,13 +11,14 @@ #include "log.h" #include "resourceconfig.h" +#include "hawd/dataset.h" +#include "hawd/formatter.h" + #include "event_generated.h" #include "entity_generated.h" #include "metadata_generated.h" #include "createentity_generated.h" -#include - /** * Benchmark full system with the dummy resource implementation. */ @@ -96,8 +97,15 @@ private Q_SLOTS: Akonadi2::Store::synchronize(query).exec().waitForFinished(); } auto allProcessedTime = time.elapsed(); - qDebug() << "Append to messagequeue " << appendTime; - qDebug() << "All processed: " << allProcessedTime << "/sec " << num*1000/allProcessedTime; + + HAWD::Dataset dataset("dummy_write_to_facade", m_hawdState); + HAWD::Dataset::Row row = dataset.row(); + + row.setValue("rows", num); + row.setValue("append", (qreal)num/appendTime); + row.setValue("total", (qreal)num/allProcessedTime); + dataset.insertRow(row); + HAWD::Formatter::print(dataset); } void testQueryByUid() @@ -116,7 +124,14 @@ private Q_SLOTS: auto model = Akonadi2::Store::loadModel(query); QTRY_COMPARE(model->rowCount(QModelIndex()), num); } - qDebug() << "Query Time: " << time.elapsed() << "/sec " << num*1000/time.elapsed(); + auto queryTime = time.elapsed(); + + HAWD::Dataset dataset("dummy_query_by_uid", m_hawdState); + HAWD::Dataset::Row row = dataset.row(); + row.setValue("rows", num); + row.setValue("read", (qreal)num/queryTime); + dataset.insertRow(row); + HAWD::Formatter::print(dataset); } void testWriteInProcess() @@ -171,8 +186,14 @@ private Q_SLOTS: auto allProcessedTime = time.elapsed(); - std::cout << "Append to messagequeue " << appendTime << " /sec " << num*1000/appendTime << std::endl; - std::cout << "All processed: " << allProcessedTime << " /sec " << num*1000/allProcessedTime << std::endl; + HAWD::Dataset dataset("dummy_write_in_process", m_hawdState); + HAWD::Dataset::Row row = dataset.row(); + + row.setValue("rows", num); + row.setValue("append", (qreal)num/appendTime); + row.setValue("total", (qreal)num/allProcessedTime); + dataset.insertRow(row); + HAWD::Formatter::print(dataset); } void testCreateCommand() @@ -202,6 +223,9 @@ private Q_SLOTS: { DummyResource::removeFromDisk("org.kde.dummy.instance1"); } + +private: + HAWD::State m_hawdState; }; QTEST_MAIN(DummyResourceBenchmark) -- cgit v1.2.3