diff options
author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2010-10-04 15:16:36 (GMT) |
---|---|---|
committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2010-10-05 07:28:19 (GMT) |
commit | a891f20bc370c24777e22be40499e695f97738f9 (patch) | |
tree | 47b74e2fd752876a038fba29a73ff8a1491d057d /tests/benchmarks | |
parent | 488c4fd1137c5702d2a52e9c00053561b69bcdb5 (diff) | |
download | Qt-a891f20bc370c24777e22be40499e695f97738f9.zip Qt-a891f20bc370c24777e22be40499e695f97738f9.tar.gz Qt-a891f20bc370c24777e22be40499e695f97738f9.tar.bz2 |
Fix performance regression in QUuid::createUuid()
After commit 4363d4eebce4afd2ce3b3d6da205f8037357099a, createUuid()
would create a QFile, open it, read from it, and destroy it. This
resulted in a pretty serious performance regression (report says around
2000 times slower, I measured 3600 times slower on my machine).
This change creates one QFile per thread (since QFile is not thread
safe) and leaves the file open until the thread exits (at which point
QThreadStorage deletes the QFile).
This approach is around 600 times faster than the current code, which is
around 6 times slower than the original. Unfortunately, it is not
possible to restore the original performance without reintroducing the
problems that the commit mentioned above had fixed.
Benchmark is included.
Task-number: QTBUG-13877
Reviewed-by: thiago
Reviewed-by: mgoetz
Diffstat (limited to 'tests/benchmarks')
-rw-r--r-- | tests/benchmarks/corelib/corelib.pro | 3 | ||||
-rw-r--r-- | tests/benchmarks/corelib/plugin/plugin.pro | 2 | ||||
-rw-r--r-- | tests/benchmarks/corelib/plugin/quuid/quuid.pro | 6 | ||||
-rw-r--r-- | tests/benchmarks/corelib/plugin/quuid/tst_quuid.cpp | 66 |
4 files changed, 76 insertions, 1 deletions
diff --git a/tests/benchmarks/corelib/corelib.pro b/tests/benchmarks/corelib/corelib.pro index 7669e0a..8a6941b 100644 --- a/tests/benchmarks/corelib/corelib.pro +++ b/tests/benchmarks/corelib/corelib.pro @@ -4,4 +4,5 @@ SUBDIRS = \ kernel \ thread \ tools \ - codecs + codecs \ + plugin diff --git a/tests/benchmarks/corelib/plugin/plugin.pro b/tests/benchmarks/corelib/plugin/plugin.pro new file mode 100644 index 0000000..2afd7f3 --- /dev/null +++ b/tests/benchmarks/corelib/plugin/plugin.pro @@ -0,0 +1,2 @@ +TEMPLATE = subdirs +SUBDIRS = quuid diff --git a/tests/benchmarks/corelib/plugin/quuid/quuid.pro b/tests/benchmarks/corelib/plugin/quuid/quuid.pro new file mode 100644 index 0000000..4e502fc --- /dev/null +++ b/tests/benchmarks/corelib/plugin/quuid/quuid.pro @@ -0,0 +1,6 @@ +load(qttest_p4) +TEMPLATE = app +TARGET = tst_bench_quuid + +SOURCES += tst_quuid.cpp +QT -= gui diff --git a/tests/benchmarks/corelib/plugin/quuid/tst_quuid.cpp b/tests/benchmarks/corelib/plugin/quuid/tst_quuid.cpp new file mode 100644 index 0000000..e9d4b44 --- /dev/null +++ b/tests/benchmarks/corelib/plugin/quuid/tst_quuid.cpp @@ -0,0 +1,66 @@ +/**************************************************************************** +** +** Copyright (C) 2010 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$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. +** +** 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, 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. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +** +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include <QtCore/QCoreApplication> +#include <QtCore/QUuid> +#include <QtTest/QtTest> + +class tst_bench_QUuid : public QObject +{ + Q_OBJECT + +public: + tst_bench_QUuid() + { } + +private slots: + void createUuid(); +}; + +void tst_bench_QUuid::createUuid() +{ + QBENCHMARK { + QUuid::createUuid(); + } +} + +QTEST_MAIN(tst_bench_QUuid); +#include "tst_quuid.moc" |