b11317a643
Remove all trailing whitespace from the following list of files: *.cpp *.h *.conf *.qdoc *.pro *.pri *.mm *.rc *.pl *.qps *.xpm *.txt *README excluding 3rdparty, test-data and auto generated code. Note A): the only non 3rdparty c++-files that still have trailing whitespace after this change are: * src/corelib/codecs/cp949codetbl_p.h * src/corelib/codecs/qjpunicode.cpp * src/corelib/codecs/qbig5codec.cpp * src/corelib/xml/qxmlstream_p.h * src/tools/qdoc/qmlparser/qqmljsgrammar.cpp * src/tools/uic/ui4.cpp * tests/auto/other/qtokenautomaton/tokenizers/* * tests/benchmarks/corelib/tools/qstring/data.cpp * util/lexgen/tokenizer.cpp Note B): in about 30 files some overlapping 'leading tab' and 'TAB character in non-leading whitespace' issues have been fixed to make the sanity bot happy. Plus some general ws-fixes here and there as asked for during review. Change-Id: Ia713113c34d82442d6ce4d93d8b1cf545075d11d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
466 lines
10 KiB
C++
466 lines
10 KiB
C++
/****************************************************************************
|
|
**
|
|
** Copyright (C) 2013 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 <qtconcurrentrun.h>
|
|
#include <qfuture.h>
|
|
#include <QString>
|
|
#include <QtTest/QtTest>
|
|
|
|
using namespace QtConcurrent;
|
|
|
|
class tst_QtConcurrentRun: public QObject
|
|
{
|
|
Q_OBJECT
|
|
private slots:
|
|
void runLightFunction();
|
|
void runHeavyFunction();
|
|
void returnValue();
|
|
void functionObject();
|
|
void memberFunctions();
|
|
void implicitConvertibleTypes();
|
|
void runWaitLoop();
|
|
void recursive();
|
|
#ifndef QT_NO_EXCEPTIONS
|
|
void exceptions();
|
|
#endif
|
|
#ifdef Q_COMPILER_DECLTYPE
|
|
void functor();
|
|
#endif
|
|
#ifdef Q_COMPILER_LAMBDA
|
|
void lambda();
|
|
#endif
|
|
};
|
|
|
|
void light()
|
|
{
|
|
qDebug("in function");
|
|
qDebug("done function");
|
|
}
|
|
|
|
void heavy()
|
|
{
|
|
qDebug("in function");
|
|
QString str;
|
|
for (int i = 0; i < 1000000; ++i)
|
|
str.append("a");
|
|
qDebug("done function");
|
|
}
|
|
|
|
|
|
void tst_QtConcurrentRun::runLightFunction()
|
|
{
|
|
qDebug("starting function");
|
|
QFuture<void> future = run(light);
|
|
qDebug("waiting");
|
|
future.waitForFinished();
|
|
qDebug("done");
|
|
}
|
|
|
|
void tst_QtConcurrentRun::runHeavyFunction()
|
|
{
|
|
qDebug("starting function");
|
|
QFuture<void> future = run(heavy);
|
|
qDebug("waiting");
|
|
future.waitForFinished();
|
|
qDebug("done");
|
|
}
|
|
|
|
int returnInt0()
|
|
{
|
|
return 10;
|
|
}
|
|
|
|
int returnInt1(int i)
|
|
{
|
|
return i;
|
|
}
|
|
|
|
class A
|
|
{
|
|
public:
|
|
int member0() { return 10; }
|
|
int member1(int in) { return in; }
|
|
|
|
typedef int result_type;
|
|
int operator()() { return 10; }
|
|
int operator()(int in) { return in; }
|
|
};
|
|
|
|
class AConst
|
|
{
|
|
public:
|
|
int member0() const { return 10; }
|
|
int member1(int in) const { return in; }
|
|
|
|
typedef int result_type;
|
|
int operator()() const { return 10; }
|
|
int operator()(int in) const { return in; }
|
|
};
|
|
|
|
void tst_QtConcurrentRun::returnValue()
|
|
{
|
|
QFuture<int> f;
|
|
|
|
f = run(returnInt0);
|
|
QCOMPARE(f.result(), 10);
|
|
|
|
A a;
|
|
f = run(&a, &A::member0);
|
|
QCOMPARE(f.result(), 10);
|
|
|
|
f = run(&a, &A::member1, 20);
|
|
QCOMPARE(f.result(), 20);
|
|
|
|
f = run(a, &A::member0);
|
|
QCOMPARE(f.result(), 10);
|
|
|
|
f = run(a, &A::member1, 20);
|
|
QCOMPARE(f.result(), 20);
|
|
|
|
f = run(a);
|
|
QCOMPARE(f.result(), 10);
|
|
|
|
f = run(&a);
|
|
QCOMPARE(f.result(), 10);
|
|
|
|
f = run(a, 20);
|
|
QCOMPARE(f.result(), 20);
|
|
|
|
f = run(&a, 20);
|
|
QCOMPARE(f.result(), 20);
|
|
|
|
const AConst aConst = AConst();
|
|
f = run(&aConst, &AConst::member0);
|
|
QCOMPARE(f.result(), 10);
|
|
|
|
f = run(&aConst, &AConst::member1, 20);
|
|
QCOMPARE(f.result(), 20);
|
|
|
|
f = run(aConst, &AConst::member0);
|
|
QCOMPARE(f.result(), 10);
|
|
|
|
f = run(aConst, &AConst::member1, 20);
|
|
QCOMPARE(f.result(), 20);
|
|
|
|
f = run(aConst);
|
|
QCOMPARE(f.result(), 10);
|
|
|
|
f = run(&aConst);
|
|
QCOMPARE(f.result(), 10);
|
|
|
|
f = run(aConst, 20);
|
|
QCOMPARE(f.result(), 20);
|
|
|
|
f = run(&aConst, 20);
|
|
QCOMPARE(f.result(), 20);
|
|
}
|
|
|
|
struct TestClass
|
|
{
|
|
void foo() { }
|
|
typedef void result_type;
|
|
void operator()() { }
|
|
void operator()(int) { }
|
|
void fooInt(int){ };
|
|
};
|
|
|
|
struct TestConstClass
|
|
{
|
|
void foo() const { }
|
|
typedef void result_type;
|
|
void operator()() const { }
|
|
void operator()(int) const { }
|
|
void fooInt(int) const { };
|
|
};
|
|
|
|
void tst_QtConcurrentRun::functionObject()
|
|
{
|
|
QFuture<void> f;
|
|
TestClass c;
|
|
|
|
f = run(c);
|
|
f = run(&c);
|
|
f = run(c, 10);
|
|
f = run(&c, 10);
|
|
|
|
const TestConstClass cc = TestConstClass();
|
|
f = run(cc);
|
|
f = run(&cc);
|
|
f = run(cc, 10);
|
|
f = run(&cc, 10);
|
|
}
|
|
|
|
|
|
void tst_QtConcurrentRun::memberFunctions()
|
|
{
|
|
TestClass c;
|
|
|
|
run(c, &TestClass::foo).waitForFinished();
|
|
run(&c, &TestClass::foo).waitForFinished();
|
|
run(c, &TestClass::fooInt, 10).waitForFinished();
|
|
run(&c, &TestClass::fooInt, 10).waitForFinished();
|
|
|
|
const TestConstClass cc = TestConstClass();
|
|
run(cc, &TestConstClass::foo).waitForFinished();
|
|
run(&cc, &TestConstClass::foo).waitForFinished();
|
|
run(cc, &TestConstClass::fooInt, 10).waitForFinished();
|
|
run(&cc, &TestConstClass::fooInt, 10).waitForFinished();
|
|
}
|
|
|
|
|
|
void doubleFunction(double)
|
|
{
|
|
|
|
}
|
|
|
|
void stringConstRefFunction(const QString &)
|
|
{
|
|
|
|
}
|
|
|
|
void stringRefFunction(QString &)
|
|
{
|
|
|
|
}
|
|
|
|
void stringFunction(QString)
|
|
{
|
|
|
|
}
|
|
|
|
void stringIntFunction(QString)
|
|
{
|
|
|
|
}
|
|
|
|
|
|
void tst_QtConcurrentRun::implicitConvertibleTypes()
|
|
{
|
|
double d;
|
|
run(doubleFunction, d).waitForFinished();
|
|
int i;
|
|
run(doubleFunction, d).waitForFinished();
|
|
run(doubleFunction, i).waitForFinished();
|
|
run(doubleFunction, 10).waitForFinished();
|
|
run(stringFunction, QLatin1String("Foo")).waitForFinished();
|
|
run(stringConstRefFunction, QLatin1String("Foo")).waitForFinished();
|
|
QString string;
|
|
run(stringRefFunction, string).waitForFinished();
|
|
}
|
|
|
|
void fn() { }
|
|
|
|
void tst_QtConcurrentRun::runWaitLoop()
|
|
{
|
|
for (int i = 0; i < 1000; ++i)
|
|
run(fn).waitForFinished();
|
|
}
|
|
|
|
QAtomicInt count;
|
|
|
|
void recursiveRun(int level)
|
|
{
|
|
count.ref();
|
|
if (--level > 0) {
|
|
QFuture<void> f1 = run(recursiveRun, level);
|
|
QFuture<void> f2 = run(recursiveRun, level);
|
|
f1.waitForFinished();
|
|
f2.waitForFinished();
|
|
}
|
|
}
|
|
|
|
int recursiveResult(int level)
|
|
{
|
|
count.ref();
|
|
if (--level > 0) {
|
|
QFuture<int> f1 = run(recursiveResult, level);
|
|
QFuture<int> f2 = run(recursiveResult, level);
|
|
return f1.result() + f2.result();
|
|
}
|
|
return 1;
|
|
}
|
|
|
|
void tst_QtConcurrentRun::recursive()
|
|
{
|
|
int levels = 15;
|
|
|
|
for (int i = 0; i < QThread::idealThreadCount(); ++i) {
|
|
count.store(0);
|
|
QThreadPool::globalInstance()->setMaxThreadCount(i);
|
|
recursiveRun(levels);
|
|
QCOMPARE(count.load(), (int)pow(2.0, levels) - 1);
|
|
}
|
|
|
|
for (int i = 0; i < QThread::idealThreadCount(); ++i) {
|
|
count.store(0);
|
|
QThreadPool::globalInstance()->setMaxThreadCount(i);
|
|
recursiveResult(levels);
|
|
QCOMPARE(count.load(), (int)pow(2.0, levels) - 1);
|
|
}
|
|
}
|
|
|
|
int e;
|
|
void vfn0()
|
|
{
|
|
++e;
|
|
}
|
|
|
|
int fn0()
|
|
{
|
|
return 1;
|
|
}
|
|
|
|
void vfn1(double)
|
|
{
|
|
++e;
|
|
}
|
|
|
|
int fn1(int)
|
|
{
|
|
return 1;
|
|
}
|
|
|
|
void vfn2(double, int *)
|
|
{
|
|
++e;
|
|
}
|
|
|
|
int fn2(double, int *)
|
|
{
|
|
return 1;
|
|
}
|
|
|
|
|
|
#ifndef QT_NO_EXCEPTIONS
|
|
void throwFunction()
|
|
{
|
|
throw QException();
|
|
}
|
|
|
|
int throwFunctionReturn()
|
|
{
|
|
throw QException();
|
|
return 0;
|
|
}
|
|
|
|
void tst_QtConcurrentRun::exceptions()
|
|
{
|
|
bool caught = false;
|
|
try {
|
|
QtConcurrent::run(throwFunction).waitForFinished();
|
|
} catch (QException &) {
|
|
caught = true;
|
|
}
|
|
if (!caught)
|
|
QFAIL("did not get exception");
|
|
|
|
caught = false;
|
|
try {
|
|
QtConcurrent::run(throwFunctionReturn).waitForFinished();
|
|
} catch (QException &) {
|
|
caught = true;
|
|
}
|
|
if (!caught)
|
|
QFAIL("did not get exception");
|
|
}
|
|
#endif
|
|
|
|
#ifdef Q_COMPILER_DECLTYPE
|
|
// Compiler supports decltype
|
|
struct Functor {
|
|
int operator()() { return 42; }
|
|
double operator()(double a, double b) { return a/b; }
|
|
int operator()(int a, int b) { return a/b; }
|
|
void operator()(int) { }
|
|
void operator()(int, int, int) { }
|
|
void operator()(int, int, int, int) { }
|
|
void operator()(int, int, int, int, int) { }
|
|
void operator()(int, int, int, int, int, int) { }
|
|
};
|
|
|
|
// This tests functor without result_type; decltype need to be supported by the compiler.
|
|
void tst_QtConcurrentRun::functor()
|
|
{
|
|
Functor f;
|
|
{
|
|
QFuture<int> fut = QtConcurrent::run(f);
|
|
QCOMPARE(fut.result(), 42);
|
|
}
|
|
{
|
|
QFuture<double> fut = QtConcurrent::run(f, 8.5, 1.8);
|
|
QCOMPARE(fut.result(), (8.5/1.8));
|
|
}
|
|
{
|
|
QFuture<int> fut = QtConcurrent::run(f, 19, 3);
|
|
QCOMPARE(fut.result(), int(19/3));
|
|
}
|
|
{
|
|
QtConcurrent::run(f, 1).waitForFinished();
|
|
QtConcurrent::run(f, 1,2).waitForFinished();
|
|
QtConcurrent::run(f, 1,2,3).waitForFinished();
|
|
QtConcurrent::run(f, 1,2,3,4).waitForFinished();
|
|
QtConcurrent::run(f, 1,2,3,4,5).waitForFinished();
|
|
}
|
|
}
|
|
#endif
|
|
|
|
#ifdef Q_COMPILER_LAMBDA
|
|
// Compiler supports lambda
|
|
void tst_QtConcurrentRun::lambda()
|
|
{
|
|
QCOMPARE(QtConcurrent::run([](){ return 45; }).result(), 45);
|
|
QCOMPARE(QtConcurrent::run([](int a){ return a+15; }, 12).result(), 12+15);
|
|
QCOMPARE(QtConcurrent::run([](int a, double b){ return a + b; }, 12, 15).result(), double(12+15));
|
|
QCOMPARE(QtConcurrent::run([](int a , int, int, int, int b){ return a + b; }, 1, 2, 3, 4, 5).result(), 1 + 5);
|
|
|
|
#ifdef Q_COMPILER_INITIALIZER_LISTS
|
|
{
|
|
QString str { "Hello World Foo" };
|
|
QFuture<QStringList> f1 = QtConcurrent::run([&](){ return str.split(' '); });
|
|
auto r = f1.result();
|
|
QCOMPARE(r, QStringList({"Hello", "World", "Foo"}));
|
|
}
|
|
#endif
|
|
}
|
|
#endif
|
|
|
|
QTEST_MAIN(tst_QtConcurrentRun)
|
|
#include "tst_qtconcurrentrun.moc"
|