2bbf9befd8
... and deprecate the old registerTimer() functions. The new pure- virtual registerTimer() breaks source-compatibility. Subclasses cannot be instantiated anymore, since the pure virtual function signature has changed. QAbstractEventDispatcher::TimerInfo is no longer a QPair. It is now a struct with timerId, interval, and timerType members. This is a source incompatibility that should only affect subclasses of QAbstractEventDispatcher, which will need to pass 3 arguments to the TimerInfo constructor instead of 2. If the subclass used QPair<int,int> instead of the TimerInfo typedef, the QPair<int,int> declarations will need to be replaced with TimerInfo. Call the new registerTimer() function with the type from QObject::startTimer(). Change all subclasses of QAbstractEventDispatcher to reimplement the new virtual function. The type argument is unused at the momemnt, except to ensure that registeredTimers() returns the type each timer was registered with. Implementations for the various dispatchers will be done in separate commits. Author: Thiago Macieira <thiago.macieira@nokia.com> Change-Id: Ia22697e0ab0847810c5d162ef473e0e5a17a904b Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
130 lines
4.0 KiB
C++
130 lines
4.0 KiB
C++
/****************************************************************************
|
|
**
|
|
** 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 <QtCore>
|
|
#include <QtTest/QtTest>
|
|
|
|
/* Custom event dispatcher to ensure we don't receive any spontaneous events */
|
|
class TestEventDispatcher : public QAbstractEventDispatcher
|
|
{
|
|
Q_OBJECT
|
|
|
|
public:
|
|
TestEventDispatcher(QObject* parent =0)
|
|
: QAbstractEventDispatcher(parent)
|
|
{}
|
|
void flush() {}
|
|
bool hasPendingEvents() { return false; }
|
|
void interrupt() {}
|
|
bool processEvents(QEventLoop::ProcessEventsFlags) { return false; }
|
|
void registerSocketNotifier(QSocketNotifier*) {}
|
|
void registerTimer(int,int,Qt::TimerType,QObject*) {}
|
|
QList<TimerInfo> registeredTimers(QObject*) const { return QList<TimerInfo>(); }
|
|
void unregisterSocketNotifier(QSocketNotifier*) {}
|
|
bool unregisterTimer(int) { return false; }
|
|
bool unregisterTimers(QObject*) { return false; }
|
|
void wakeUp() {}
|
|
};
|
|
|
|
class tst_BenchlibOptions: public QObject
|
|
{
|
|
Q_OBJECT
|
|
|
|
private slots:
|
|
void threeEvents();
|
|
};
|
|
|
|
class tst_BenchlibFifteenIterations : public tst_BenchlibOptions
|
|
{ Q_OBJECT };
|
|
class tst_BenchlibOneHundredMinimum : public tst_BenchlibOptions
|
|
{ Q_OBJECT };
|
|
|
|
void tst_BenchlibOptions::threeEvents()
|
|
{
|
|
QAbstractEventDispatcher* ed = QAbstractEventDispatcher::instance();
|
|
QBENCHMARK {
|
|
ed->filterEvent(0);
|
|
ed->filterEvent(0);
|
|
ed->filterEvent(0);
|
|
}
|
|
}
|
|
|
|
int main(int argc, char** argv)
|
|
{
|
|
int ret = 0;
|
|
|
|
TestEventDispatcher dispatcher;
|
|
QCoreApplication app(argc, argv);
|
|
|
|
/* Run with no special arguments. */
|
|
{
|
|
tst_BenchlibOptions test;
|
|
ret += QTest::qExec(&test, argc, argv);
|
|
}
|
|
|
|
/* Run with an exact number of iterations. */
|
|
{
|
|
QVector<char const*> args;
|
|
for (int i = 0; i < argc; ++i) args << argv[i];
|
|
args << "-iterations";
|
|
args << "15";
|
|
tst_BenchlibFifteenIterations test;
|
|
ret += QTest::qExec(&test, args.count(), const_cast<char**>(args.data()));
|
|
}
|
|
|
|
/*
|
|
Run until getting a value of at least 100.
|
|
*/
|
|
{
|
|
QVector<char const*> args;
|
|
for (int i = 0; i < argc; ++i) args << argv[i];
|
|
args << "-minimumvalue";
|
|
args << "100";
|
|
tst_BenchlibOneHundredMinimum test;
|
|
ret += QTest::qExec(&test, args.count(), const_cast<char**>(args.data()));
|
|
}
|
|
|
|
return ret;
|
|
}
|
|
|
|
#include "tst_benchliboptions.moc"
|