Added QTest::setBenchmarkResult() to public API.

A benchmark result can now be registered explicitly
using the QTest::setBenchmarkResult() function as
an alternative to using a QBENCHMARK* macro.
This gives benchmark writers the freedom to compute
the benchmark result however they like and not be
dependent on the automatic iteration/accumulation
algorithm of a QBENCHMARK* macro.

The function takes two arguments: a value and a metric.
The value must be a non-negative real, while the metric
is an enum type.

WARNING: The set of available metrics include metrics
for which a high value is considered better
(i.e. faster) than a low value (one example is
'frames per second'). QTestLib currently does not
distinguish between the two cases of "higher is better"
and "lower is better", and leaves it to external
tools (parsing the QTestLib output) to recognize
them and do any necessary conversion. A tool that
plots benchmark result history could e.g. convert
all "higher is better" to "lower is better". For
the 'frames per second' case, this would typically
mean converting FPS to SPF (= 1/FPS).

Reviewed-by: MortenS

1 files changed, 87 insertions, 0 deletions

diff --git a/src/testlib/qbenchmarkmetric.cpp b/src/testlib/qbenchmarkmetric.cpp
new file mode 100644
index 0000000..614357c
--- /dev/null
+++ b/src/testlib/qbenchmarkmetric.cpp
@@ -0,0 +1,87 @@
+/****************************************************************************
+ **
+ ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+ ** All rights reserved.
+ ** Contact: Nokia Corporation (qt-info@nokia.com)
+ **
+ ** This file is part of the QtTest module of the Qt Toolkit.
+ **
+ ** $QT_BEGIN_LICENSE:LGPL$
+ ** No Commercial Usage
+ ** This file contains pre-release code and may not be distributed.
+ ** You may use this file in accordance with the terms and conditions
+ ** contained in the Technology Preview License Agreement accompanying
+ ** this package.
+ **
+ ** GNU Lesser General Public License Usage
+ ** Alternatively, this file may be used under the terms of the GNU Lesser
+ ** General Public License version 2.1 as published by the Free Software
+ ** Foundation and appearing in the file LICENSE.LGPL included in the
+ ** packaging of this file.  Please review the following information to
+ ** ensure the GNU Lesser General Public License version 2.1 requirements
+ ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ **
+ ** In addition, as a special exception, Nokia gives you certain additional
+ ** rights.  These rights are described in the Nokia Qt LGPL Exception
+ ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+ **
+ ** If you have questions regarding the use of this file, please contact
+ ** Nokia at qt-info@nokia.com.
+ **
+ **
+ **
+ **
+ **
+ **
+ **
+ **
+ ** $QT_END_LICENSE$
+ **
+ ****************************************************************************/
+
+#include <QtTest/private/qbenchmarkmetric_p.h>
+
+const char * QTest::benchmarkMetricName(QBenchmarkMetric metric)
+{
+    switch (metric) {
+    case FramesPerSecond:
+        return "FramesPerSecond";
+    case BitsPerSecond:
+        return "BitsPerSecond";
+    case BytesPerSecond:
+        return "BytesPerSecond";
+    case WalltimeMilliseconds:
+        return "WalltimeMilliseconds";
+    case CPUTicks:
+        return "CPUTicks";
+    case InstructionReads:
+        return "InstructionReads";
+    case Events:
+        return "Events";
+    default:
+        return "";
+    }
+};
+
+const char * QTest::benchmarkMetricUnit(QBenchmarkMetric metric)
+{
+    switch (metric) {
+    case FramesPerSecond:
+        return "fps";
+    case BitsPerSecond:
+        return "bits/s";
+    case BytesPerSecond:
+        return "bytes/s";
+    case WalltimeMilliseconds:
+        return "msecs";
+    case CPUTicks:
+        return "CPU ticks";
+    case InstructionReads:
+        return "instruction reads";
+    case Events:
+        return "events";
+    default:
+        return "";
+    }
+}
+