From cd6ebb4912a5d96c788ea0c838d8a1a06ff4029e Mon Sep 17 00:00:00 2001 From: Michael Brasser Date: Fri, 3 Jun 2011 09:50:04 +1000 Subject: Replace QPerformanceTimer with QElapsedTimer. QElapsedTimer has added a nsecsElapsed() function, so QPerformanceTimer is no longer needed. Reviewed-by: Charles Yin --- .../qdeclarativedebugtrace.pro | 8 ++ .../tst_qdeclarativedebugtrace.cpp | 100 +++++++++++++++++++++ .../qperformancetimer/qperformancetimer.pro | 8 -- .../qperformancetimer/tst_qperformancetimer.cpp | 100 --------------------- 4 files changed, 108 insertions(+), 108 deletions(-) create mode 100644 tests/benchmarks/declarative/qdeclarativedebugtrace/qdeclarativedebugtrace.pro create mode 100644 tests/benchmarks/declarative/qdeclarativedebugtrace/tst_qdeclarativedebugtrace.cpp delete mode 100644 tests/benchmarks/declarative/qperformancetimer/qperformancetimer.pro delete mode 100644 tests/benchmarks/declarative/qperformancetimer/tst_qperformancetimer.cpp (limited to 'tests/benchmarks') diff --git a/tests/benchmarks/declarative/qdeclarativedebugtrace/qdeclarativedebugtrace.pro b/tests/benchmarks/declarative/qdeclarativedebugtrace/qdeclarativedebugtrace.pro new file mode 100644 index 0000000000..e9aea4f71c --- /dev/null +++ b/tests/benchmarks/declarative/qdeclarativedebugtrace/qdeclarativedebugtrace.pro @@ -0,0 +1,8 @@ +load(qttest_p4) +QT += declarative +TEMPLATE = app +TARGET = tst_qdeclarativedebugtrace +macx:CONFIG -= app_bundle + +SOURCES += tst_qdeclarativedebugtrace.cpp + diff --git a/tests/benchmarks/declarative/qdeclarativedebugtrace/tst_qdeclarativedebugtrace.cpp b/tests/benchmarks/declarative/qdeclarativedebugtrace/tst_qdeclarativedebugtrace.cpp new file mode 100644 index 0000000000..224e7b471f --- /dev/null +++ b/tests/benchmarks/declarative/qdeclarativedebugtrace/tst_qdeclarativedebugtrace.cpp @@ -0,0 +1,100 @@ +/**************************************************************************** +** +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** GNU Lesser General Public License Usage +** 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. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. +** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include +#include +#include + +class tst_qdeclarativedebugtrace : public QObject +{ + Q_OBJECT + +public: + tst_qdeclarativedebugtrace() {} + +private slots: + void all(); + void startElapsed(); + void doubleElapsed(); + void trace(); +}; + +void tst_qdeclarativedebugtrace::all() +{ + QBENCHMARK { + QElapsedTimer t; + t.start(); + t.nsecsElapsed(); + } +} + +void tst_qdeclarativedebugtrace::startElapsed() +{ + QElapsedTimer t; + QBENCHMARK { + t.start(); + t.nsecsElapsed(); + } +} + +void tst_qdeclarativedebugtrace::doubleElapsed() +{ + QElapsedTimer t; + t.start(); + QBENCHMARK { + t.nsecsElapsed(); + t.nsecsElapsed(); + } +} + +void tst_qdeclarativedebugtrace::trace() +{ + QString s("A decent sized string of text here."); + QBENCHMARK { + QByteArray data; + QDataStream ds(&data, QIODevice::WriteOnly); + ds << (qint64)100 << (int)5 << (int)5 << s; + } +} + +QTEST_MAIN(tst_qdeclarativedebugtrace) + +#include "tst_qdeclarativedebugtrace.moc" diff --git a/tests/benchmarks/declarative/qperformancetimer/qperformancetimer.pro b/tests/benchmarks/declarative/qperformancetimer/qperformancetimer.pro deleted file mode 100644 index a39cd3d979..0000000000 --- a/tests/benchmarks/declarative/qperformancetimer/qperformancetimer.pro +++ /dev/null @@ -1,8 +0,0 @@ -load(qttest_p4) -QT += declarative -TEMPLATE = app -TARGET = tst_qperformancetimer -macx:CONFIG -= app_bundle - -SOURCES += tst_qperformancetimer.cpp - diff --git a/tests/benchmarks/declarative/qperformancetimer/tst_qperformancetimer.cpp b/tests/benchmarks/declarative/qperformancetimer/tst_qperformancetimer.cpp deleted file mode 100644 index e52cd2e573..0000000000 --- a/tests/benchmarks/declarative/qperformancetimer/tst_qperformancetimer.cpp +++ /dev/null @@ -1,100 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** 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. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include -#include -#include - -class tst_qperformancetimer : public QObject -{ - Q_OBJECT - -public: - tst_qperformancetimer() {} - -private slots: - void all(); - void startElapsed(); - void doubleElapsed(); - void trace(); -}; - -void tst_qperformancetimer::all() -{ - QBENCHMARK { - QPerformanceTimer t; - t.start(); - t.elapsed(); - } -} - -void tst_qperformancetimer::startElapsed() -{ - QPerformanceTimer t; - QBENCHMARK { - t.start(); - t.elapsed(); - } -} - -void tst_qperformancetimer::doubleElapsed() -{ - QPerformanceTimer t; - t.start(); - QBENCHMARK { - t.elapsed(); - t.elapsed(); - } -} - -void tst_qperformancetimer::trace() -{ - QString s("A decent sized string of text here."); - QBENCHMARK { - QByteArray data; - QDataStream ds(&data, QIODevice::WriteOnly); - ds << (qint64)100 << (int)5 << (int)5 << s; - } -} - -QTEST_MAIN(tst_qperformancetimer) - -#include "tst_qperformancetimer.moc" -- cgit v1.2.3