From f6c3c5b49ebe8eb5c8b25298caa06b575a943035 Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Mon, 24 Aug 2015 23:41:15 +0200 Subject: Cleaned-up genericresourcebenchmark --- hawd_defs/generic_write_in_process | 6 ++---- hawd_defs/generic_write_in_process_with_indexes | 6 ++---- tests/genericresourcebenchmark.cpp | 21 ++++++++++----------- 3 files changed, 14 insertions(+), 19 deletions(-) diff --git a/hawd_defs/generic_write_in_process b/hawd_defs/generic_write_in_process index b597fea..64efd5e 100644 --- a/hawd_defs/generic_write_in_process +++ b/hawd_defs/generic_write_in_process @@ -3,9 +3,7 @@ "description": "Measures performance of the GenericResource class", "columns": { "rows": { "type": "int" }, - "append": { "type": "int", "unit": "ms", "min": 0, "max": 100 }, - "appendOps": { "type": "float", "unit": "ops/ms" }, - "total": { "type": "int", "unit": "ms", "min": 0, "max": 100 }, - "totalOps": { "type": "float", "unit": "ops/ms" } + "append": { "type": "float", "unit": "ops/ms" }, + "total": { "type": "float", "unit": "ops/ms" } } } diff --git a/hawd_defs/generic_write_in_process_with_indexes b/hawd_defs/generic_write_in_process_with_indexes index 1c32276..81ff673 100644 --- a/hawd_defs/generic_write_in_process_with_indexes +++ b/hawd_defs/generic_write_in_process_with_indexes @@ -3,9 +3,7 @@ "description": "Measures performance of the GenericResource class with indexing", "columns": { "rows": { "type": "int" }, - "append": { "type": "int", "unit": "ms", "min": 0, "max": 100 }, - "appendOps": { "type": "float", "unit": "ops/ms" }, - "total": { "type": "int", "unit": "ms", "min": 0, "max": 100 }, - "totalOps": { "type": "float", "unit": "ops/ms" } + "append": { "type": "float", "unit": "ops/ms" }, + "total": { "type": "float", "unit": "ops/ms" } } } diff --git a/tests/genericresourcebenchmark.cpp b/tests/genericresourcebenchmark.cpp index 7d0d73a..50d0c67 100644 --- a/tests/genericresourcebenchmark.cpp +++ b/tests/genericresourcebenchmark.cpp @@ -3,8 +3,6 @@ #include #include "event_generated.h" -#include "entity_generated.h" -#include "metadata_generated.h" #include "createentity_generated.h" #include "commands.h" #include "entitybuffer.h" @@ -13,7 +11,6 @@ #include "definitions.h" #include "domainadaptor.h" #include "index.h" -#include #include "hawd/dataset.h" #include "hawd/formatter.h" @@ -126,14 +123,15 @@ private Q_SLOTS: auto allProcessedTime = time.elapsed(); + // Print memory layout, RSS is what is in memory + // std::system("exec pmap -x \"$PPID\""); + HAWD::Dataset dataset("generic_write_in_process", m_hawdState); HAWD::Dataset::Row row = dataset.row(); row.setValue("rows", num); - row.setValue("append", appendTime); - row.setValue("appendOps", (qreal)num/appendTime); - row.setValue("total", allProcessedTime); - row.setValue("totalOps", (qreal)num/allProcessedTime); + row.setValue("append", (qreal)num/appendTime); + row.setValue("total", (qreal)num/allProcessedTime); dataset.insertRow(row); HAWD::Formatter::print(dataset); } @@ -178,14 +176,15 @@ private Q_SLOTS: auto allProcessedTime = time.elapsed(); + // Print memory layout, RSS is what is in memory + // std::system("exec pmap -x \"$PPID\""); + HAWD::Dataset dataset("generic_write_in_process_with_indexes", m_hawdState); HAWD::Dataset::Row row = dataset.row(); row.setValue("rows", num); - row.setValue("append", appendTime); - row.setValue("appendOps", (qreal)num/appendTime); - row.setValue("total", allProcessedTime); - row.setValue("totalOps", (qreal)num/allProcessedTime); + row.setValue("append", (qreal)num/appendTime); + row.setValue("total", (qreal)num/allProcessedTime); dataset.insertRow(row); HAWD::Formatter::print(dataset); } -- cgit v1.2.3