test: Moving tst_QMimeDatabase::inheritsPerformance() test
tst_QMimeDatabase::inheritsPerformance() is not an unit test but a performance test, so moving it from 'tests/auto/corelib/mimetypes/qmimedatabase' to 'tests/benchmarks/corelib/mimetypes/qmimedatabase' Change-Id: I59e84f61559023659f101666683870f2ca1d2034 Reviewed-by: David Faure (KDE) <faure@kde.org> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
This commit is contained in:
parent
4b71432987
commit
aa49ad58ad
@ -517,38 +517,6 @@ void tst_QMimeDatabase::allMimeTypes()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void tst_QMimeDatabase::inheritsPerformance()
|
|
||||||
{
|
|
||||||
// Check performance of inherits().
|
|
||||||
// This benchmark (which started in 2009 in kmimetypetest.cpp) uses 40 mimetypes.
|
|
||||||
QStringList mimeTypes; mimeTypes << QLatin1String("image/jpeg") << QLatin1String("image/png") << QLatin1String("image/tiff") << QLatin1String("text/plain") << QLatin1String("text/html");
|
|
||||||
mimeTypes += mimeTypes;
|
|
||||||
mimeTypes += mimeTypes;
|
|
||||||
mimeTypes += mimeTypes;
|
|
||||||
QCOMPARE(mimeTypes.count(), 40);
|
|
||||||
QMimeDatabase db;
|
|
||||||
QMimeType mime = db.mimeTypeForName(QString::fromLatin1("text/x-chdr"));
|
|
||||||
QVERIFY(mime.isValid());
|
|
||||||
QBENCHMARK {
|
|
||||||
QString match;
|
|
||||||
foreach (const QString &mt, mimeTypes) {
|
|
||||||
if (mime.inherits(mt)) {
|
|
||||||
match = mt;
|
|
||||||
// of course there would normally be a "break" here, but we're testing worse-case
|
|
||||||
// performance here
|
|
||||||
}
|
|
||||||
}
|
|
||||||
QCOMPARE(match, QString::fromLatin1("text/plain"));
|
|
||||||
}
|
|
||||||
// Numbers from 2011, in release mode:
|
|
||||||
// KDE 4.7 numbers: 0.21 msec / 494,000 ticks / 568,345 instr. loads per iteration
|
|
||||||
// QMimeBinaryProvider (with Qt 5): 0.16 msec / NA / 416,049 instr. reads per iteration
|
|
||||||
// QMimeXmlProvider (with Qt 5): 0.062 msec / NA / 172,889 instr. reads per iteration
|
|
||||||
// (but the startup time is way higher)
|
|
||||||
// And memory usage is flat at 200K with QMimeBinaryProvider, while it peaks at 6 MB when
|
|
||||||
// parsing XML, and then keeps being around 4.5 MB for all the in-memory hashes.
|
|
||||||
}
|
|
||||||
|
|
||||||
void tst_QMimeDatabase::suffixes_data()
|
void tst_QMimeDatabase::suffixes_data()
|
||||||
{
|
{
|
||||||
QTest::addColumn<QString>("mimeType");
|
QTest::addColumn<QString>("mimeType");
|
||||||
|
@ -70,7 +70,6 @@ private slots:
|
|||||||
void mimeTypeForFileAndContent_data();
|
void mimeTypeForFileAndContent_data();
|
||||||
void mimeTypeForFileAndContent();
|
void mimeTypeForFileAndContent();
|
||||||
void allMimeTypes();
|
void allMimeTypes();
|
||||||
void inheritsPerformance();
|
|
||||||
void suffixes_data();
|
void suffixes_data();
|
||||||
void suffixes();
|
void suffixes();
|
||||||
void knownSuffix();
|
void knownSuffix();
|
||||||
|
@ -2,6 +2,7 @@ TEMPLATE = subdirs
|
|||||||
SUBDIRS = \
|
SUBDIRS = \
|
||||||
io \
|
io \
|
||||||
json \
|
json \
|
||||||
|
mimetypes \
|
||||||
kernel \
|
kernel \
|
||||||
thread \
|
thread \
|
||||||
tools \
|
tools \
|
||||||
|
3
tests/benchmarks/corelib/mimetypes/mimetypes.pro
Normal file
3
tests/benchmarks/corelib/mimetypes/mimetypes.pro
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
TEMPLATE = subdirs
|
||||||
|
SUBDIRS = \
|
||||||
|
qmimedatabase \
|
87
tests/benchmarks/corelib/mimetypes/qmimedatabase/main.cpp
Normal file
87
tests/benchmarks/corelib/mimetypes/qmimedatabase/main.cpp
Normal file
@ -0,0 +1,87 @@
|
|||||||
|
/****************************************************************************
|
||||||
|
**
|
||||||
|
** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
|
||||||
|
** Contact: http://www.qt-project.org/legal
|
||||||
|
**
|
||||||
|
** This file is part of the test suite of the Qt Toolkit.
|
||||||
|
**
|
||||||
|
** $QT_BEGIN_LICENSE:LGPL$
|
||||||
|
** Commercial License Usage
|
||||||
|
** Licensees holding valid commercial Qt licenses may use this file in
|
||||||
|
** accordance with the commercial license agreement provided with the
|
||||||
|
** Software or, alternatively, in accordance with the terms contained in
|
||||||
|
** a written agreement between you and Digia. For licensing terms and
|
||||||
|
** conditions see http://qt.digia.com/licensing. For further information
|
||||||
|
** use the contact form at http://qt.digia.com/contact-us.
|
||||||
|
**
|
||||||
|
** 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, Digia gives you certain additional
|
||||||
|
** rights. These rights are described in the Digia 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.
|
||||||
|
**
|
||||||
|
**
|
||||||
|
** $QT_END_LICENSE$
|
||||||
|
**
|
||||||
|
****************************************************************************/
|
||||||
|
|
||||||
|
#include <QtTest/QtTest>
|
||||||
|
|
||||||
|
class tst_QMimeDatabase: public QObject
|
||||||
|
{
|
||||||
|
|
||||||
|
Q_OBJECT
|
||||||
|
|
||||||
|
private slots:
|
||||||
|
void inheritsPerformance();
|
||||||
|
};
|
||||||
|
|
||||||
|
void tst_QMimeDatabase::inheritsPerformance()
|
||||||
|
{
|
||||||
|
// Check performance of inherits().
|
||||||
|
// This benchmark (which started in 2009 in kmimetypetest.cpp) uses 40 mimetypes.
|
||||||
|
QStringList mimeTypes;
|
||||||
|
mimeTypes << QLatin1String("image/jpeg") << QLatin1String("image/png") << QLatin1String("image/tiff") << QLatin1String("text/plain") << QLatin1String("text/html");
|
||||||
|
mimeTypes += mimeTypes;
|
||||||
|
mimeTypes += mimeTypes;
|
||||||
|
mimeTypes += mimeTypes;
|
||||||
|
QCOMPARE(mimeTypes.count(), 40);
|
||||||
|
QMimeDatabase db;
|
||||||
|
QMimeType mime = db.mimeTypeForName(QString::fromLatin1("text/x-chdr"));
|
||||||
|
QVERIFY(mime.isValid());
|
||||||
|
QBENCHMARK {
|
||||||
|
QString match;
|
||||||
|
foreach (const QString &mt, mimeTypes) {
|
||||||
|
if (mime.inherits(mt)) {
|
||||||
|
match = mt;
|
||||||
|
// of course there would normally be a "break" here, but we're testing worse-case
|
||||||
|
// performance here
|
||||||
|
}
|
||||||
|
}
|
||||||
|
QCOMPARE(match, QString::fromLatin1("text/plain"));
|
||||||
|
}
|
||||||
|
// Numbers from 2011, in release mode:
|
||||||
|
// KDE 4.7 numbers: 0.21 msec / 494,000 ticks / 568,345 instr. loads per iteration
|
||||||
|
// QMimeBinaryProvider (with Qt 5): 0.16 msec / NA / 416,049 instr. reads per iteration
|
||||||
|
// QMimeXmlProvider (with Qt 5): 0.062 msec / NA / 172,889 instr. reads per iteration
|
||||||
|
// (but the startup time is way higher)
|
||||||
|
// And memory usage is flat at 200K with QMimeBinaryProvider, while it peaks at 6 MB when
|
||||||
|
// parsing XML, and then keeps being around 4.5 MB for all the in-memory hashes.
|
||||||
|
}
|
||||||
|
|
||||||
|
QTEST_MAIN(tst_QMimeDatabase)
|
||||||
|
#include "main.moc"
|
@ -0,0 +1,6 @@
|
|||||||
|
QT = core testlib
|
||||||
|
|
||||||
|
TARGET = tst_bench_qmimedatabase
|
||||||
|
SOURCES = main.cpp
|
||||||
|
|
||||||
|
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
|
Loading…
Reference in New Issue
Block a user