Changeset 846 for trunk/src/testlib/qbenchmarkmeasurement.cpp

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/testlib/qbenchmarkmeasurement.cpp (modified) (6 diffs)

trunk/src/testlib/qbenchmarkmeasurement.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -42 +42 @@
 #include "QtTest/private/qbenchmarkmeasurement_p.h"
 #include "QtTest/private/qbenchmark_p.h"
+#include "QtTest/private/qbenchmarkmetric_p.h"
+#include "qbenchmark.h"
 #include <qdebug.h>
 
@@ -65 +67 @@
 bool QBenchmarkTimeMeasurer::isMeasurementAccepted(qint64 measurement)
 {
-    return (measurement > 20);
+    return (measurement > 50);
 }
 
@@ -73 +75 @@
 }
 
+bool QBenchmarkTimeMeasurer::needsWarmupIteration()
+{
+    return true;
+}
+
 int QBenchmarkTimeMeasurer::adjustMedianCount(int)
 { 
@@ -78 +85 @@
 }
 
-QString QBenchmarkTimeMeasurer::unitText()
+QTest::QBenchmarkMetric QBenchmarkTimeMeasurer::metricType()
 {
-    return QLatin1String("msec");
-}
-
-QString QBenchmarkTimeMeasurer::metricText()
-{
-    return QLatin1String("walltime");
+    return QTest::WalltimeMilliseconds;
 }
 
@@ -127 +129 @@
 }
 
-QString QBenchmarkTickMeasurer::unitText()
+QTest::QBenchmarkMetric QBenchmarkTickMeasurer::metricType()
 {
-    return QLatin1String("ticks");
-}
-
-QString QBenchmarkTickMeasurer::metricText()
-{
-    return QLatin1String("cputicks");
+    return QTest::CPUTicks;
 }