From 9ceb3b4f6f67cbfe3fb94402bb0f061f77b6da85 Mon Sep 17 00:00:00 2001 From: Jo Asplin Date: Fri, 4 Nov 2011 16:43:53 +0100 Subject: Moved qobjectperformance into other/ The qobjectperformance test is a kind of performance test that asserts that the time it takes to emit a signal to a certain number of receivers does not exceed a certain time. other/ currently seems to be a sensible place for such a test. Alternatively, it could have been put next to corelib/kernel/qobject/. Change-Id: I5c9461b62984f5806d1f6940123d30ef9f9f5a37 Reviewed-by: Jason McDonald --- tests/auto/auto.pro | 2 +- tests/auto/network.pro | 8 -- tests/auto/other/other.pro | 1 + tests/auto/other/qobjectperformance/.gitignore | 1 + .../qobjectperformance/qobjectperformance.pro | 7 ++ .../qobjectperformance/tst_qobjectperformance.cpp | 126 +++++++++++++++++++++ tests/auto/qobjectperformance/.gitignore | 1 - .../auto/qobjectperformance/qobjectperformance.pro | 7 -- .../qobjectperformance/tst_qobjectperformance.cpp | 126 --------------------- 9 files changed, 136 insertions(+), 143 deletions(-) delete mode 100644 tests/auto/network.pro create mode 100644 tests/auto/other/qobjectperformance/.gitignore create mode 100644 tests/auto/other/qobjectperformance/qobjectperformance.pro create mode 100644 tests/auto/other/qobjectperformance/tst_qobjectperformance.cpp delete mode 100644 tests/auto/qobjectperformance/.gitignore delete mode 100644 tests/auto/qobjectperformance/qobjectperformance.pro delete mode 100644 tests/auto/qobjectperformance/tst_qobjectperformance.cpp (limited to 'tests') diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index e9d3bfd167..4b22604dea 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -6,7 +6,7 @@ SUBDIRS += \ host.pro \ gui.pro \ integrationtests \ - network.pro \ + network \ opengl \ sql \ testlib \ diff --git a/tests/auto/network.pro b/tests/auto/network.pro deleted file mode 100644 index d4d07fa426..0000000000 --- a/tests/auto/network.pro +++ /dev/null @@ -1,8 +0,0 @@ -# The tests in this .pro file _MUST_ use QtCore and QtNetwork only -# (i.e. QT=core network). -# The test system is allowed to run these tests before the rest of Qt has -# been compiled. -TEMPLATE=subdirs -SUBDIRS=\ - network \ - qobjectperformance diff --git a/tests/auto/other/other.pro b/tests/auto/other/other.pro index 0224bb416c..fe36713117 100644 --- a/tests/auto/other/other.pro +++ b/tests/auto/other/other.pro @@ -4,6 +4,7 @@ SUBDIRS=\ baselineexample \ compiler \ headersclean \ + qobjectperformance \ qtokenautomaton \ cross_compile: SUBDIRS -= \ diff --git a/tests/auto/other/qobjectperformance/.gitignore b/tests/auto/other/qobjectperformance/.gitignore new file mode 100644 index 0000000000..028ca89aad --- /dev/null +++ b/tests/auto/other/qobjectperformance/.gitignore @@ -0,0 +1 @@ +tst_qobjectperformance diff --git a/tests/auto/other/qobjectperformance/qobjectperformance.pro b/tests/auto/other/qobjectperformance/qobjectperformance.pro new file mode 100644 index 0000000000..189f8eeb2a --- /dev/null +++ b/tests/auto/other/qobjectperformance/qobjectperformance.pro @@ -0,0 +1,7 @@ +CONFIG += testcase +TARGET = tst_qobjectperformance +SOURCES += tst_qobjectperformance.cpp + +QT = core network testlib + + diff --git a/tests/auto/other/qobjectperformance/tst_qobjectperformance.cpp b/tests/auto/other/qobjectperformance/tst_qobjectperformance.cpp new file mode 100644 index 0000000000..26145a0df4 --- /dev/null +++ b/tests/auto/other/qobjectperformance/tst_qobjectperformance.cpp @@ -0,0 +1,126 @@ +/**************************************************************************** +** +** 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 + +//TESTED_CLASS= +//TESTED_FILES=corelib/kernel/qobject.h corelib/kernel/qobject.cpp + +class tst_QObjectPerformance : public QObject +{ + Q_OBJECT + +public: + +private slots: + void emitToManyReceivers(); +}; + +class SimpleSenderObject : public QObject +{ + Q_OBJECT + +signals: + void signal(); + +public: + void emitSignal() + { + emit signal(); + } +}; + +class SimpleReceiverObject : public QObject +{ + Q_OBJECT + +public slots: + void slot() + { + } +}; + +void tst_QObjectPerformance::emitToManyReceivers() +{ + // ensure that emission times remain mostly linear as the number of receivers increase + + SimpleSenderObject sender; + int elapsed = 0; + const int increase = 3000; + const int base = 5000; + + for (int i = 0; i < 4; ++i) { + const int size = base + i * increase; + const double increaseRatio = double(size) / (double)(size - increase); + + QList receivers; + for (int k = 0; k < size; ++k) { + SimpleReceiverObject *receiver = new SimpleReceiverObject; + QObject::connect(&sender, SIGNAL(signal()), receiver, SLOT(slot())); + receivers.append(receiver); + } + + QTime timer; + timer.start(); + sender.emitSignal(); + int e = timer.elapsed(); + + if (elapsed > 1) { + qDebug() << size << "receivers, elapsed time" << e << "compared to previous time" << elapsed; + QVERIFY(double(e) / double(elapsed) <= increaseRatio * 2.0); + } else { + qDebug() << size << "receivers, elapsed time" << e << "cannot be compared to previous, unmeasurable time"; + } + elapsed = e; + + qDeleteAll(receivers); + receivers.clear(); + } +} + + +QTEST_MAIN(tst_QObjectPerformance) +#include "tst_qobjectperformance.moc" diff --git a/tests/auto/qobjectperformance/.gitignore b/tests/auto/qobjectperformance/.gitignore deleted file mode 100644 index 028ca89aad..0000000000 --- a/tests/auto/qobjectperformance/.gitignore +++ /dev/null @@ -1 +0,0 @@ -tst_qobjectperformance diff --git a/tests/auto/qobjectperformance/qobjectperformance.pro b/tests/auto/qobjectperformance/qobjectperformance.pro deleted file mode 100644 index 189f8eeb2a..0000000000 --- a/tests/auto/qobjectperformance/qobjectperformance.pro +++ /dev/null @@ -1,7 +0,0 @@ -CONFIG += testcase -TARGET = tst_qobjectperformance -SOURCES += tst_qobjectperformance.cpp - -QT = core network testlib - - diff --git a/tests/auto/qobjectperformance/tst_qobjectperformance.cpp b/tests/auto/qobjectperformance/tst_qobjectperformance.cpp deleted file mode 100644 index 26145a0df4..0000000000 --- a/tests/auto/qobjectperformance/tst_qobjectperformance.cpp +++ /dev/null @@ -1,126 +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 - -//TESTED_CLASS= -//TESTED_FILES=corelib/kernel/qobject.h corelib/kernel/qobject.cpp - -class tst_QObjectPerformance : public QObject -{ - Q_OBJECT - -public: - -private slots: - void emitToManyReceivers(); -}; - -class SimpleSenderObject : public QObject -{ - Q_OBJECT - -signals: - void signal(); - -public: - void emitSignal() - { - emit signal(); - } -}; - -class SimpleReceiverObject : public QObject -{ - Q_OBJECT - -public slots: - void slot() - { - } -}; - -void tst_QObjectPerformance::emitToManyReceivers() -{ - // ensure that emission times remain mostly linear as the number of receivers increase - - SimpleSenderObject sender; - int elapsed = 0; - const int increase = 3000; - const int base = 5000; - - for (int i = 0; i < 4; ++i) { - const int size = base + i * increase; - const double increaseRatio = double(size) / (double)(size - increase); - - QList receivers; - for (int k = 0; k < size; ++k) { - SimpleReceiverObject *receiver = new SimpleReceiverObject; - QObject::connect(&sender, SIGNAL(signal()), receiver, SLOT(slot())); - receivers.append(receiver); - } - - QTime timer; - timer.start(); - sender.emitSignal(); - int e = timer.elapsed(); - - if (elapsed > 1) { - qDebug() << size << "receivers, elapsed time" << e << "compared to previous time" << elapsed; - QVERIFY(double(e) / double(elapsed) <= increaseRatio * 2.0); - } else { - qDebug() << size << "receivers, elapsed time" << e << "cannot be compared to previous, unmeasurable time"; - } - elapsed = e; - - qDeleteAll(receivers); - receivers.clear(); - } -} - - -QTEST_MAIN(tst_QObjectPerformance) -#include "tst_qobjectperformance.moc" -- cgit v1.2.3