die "This script requires the QTDIR environment variable pointing to Qt 5\n" unless $qtdir;
findQtHeaders('QtCore', $qtdir);
+findQtHeaders('QtConcurrent', $qtdir);
findQtHeaders('QtWidgets', $qtdir);
findQtHeaders('QtPrintSupport', $qtdir);
#define IMAGESCALING_H
#include <QtWidgets>
+#include <QtConcurrent>
#ifndef QT_NO_CONCURRENT
TEMPLATE = app
DEPENDPATH += .
INCLUDEPATH += .
+QT += concurrent
# Input
SOURCES += main.cpp imagescaling.cpp
**
****************************************************************************/
#include <QtWidgets>
+#include <QtConcurrent>
#ifndef QT_NO_CONCURRENT
TARGET = mapdemo
DEPENDPATH += .
INCLUDEPATH += .
+QT += concurrent widgets
# Input
SOURCES += main.cpp
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtconcurrent/map
INSTALLS += target sources
-QT += widgets
-
simulator: warning(This example does not work on Simulator platform)
****************************************************************************/
#include <QtWidgets>
+#include <QtConcurrent>
#ifndef QT_NO_CONCURRENT
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtconcurrent/progressdialog
INSTALLS += target sources
-QT += widgets
+QT += concurrent widgets
simulator: warning(This example does not work on Simulator platform)
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtconcurrent/runfunction
INSTALLS += target sources
-QT += widgets
+QT += concurrent widgets
simulator: warning(This example does not work on Simulator platform)
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtconcurrent/wordcount
INSTALLS += target sources
-QT += widgets
+QT += concurrent widgets
simulator: warning(This example does not work on Simulator platform)
****************************************************************************/
#include <QtCore>
+#include <QtConcurrent>
+
/*
says hello from main thread and secondary thread using QtConcurrent
*/
QT -= gui
+QT += concurrent
CONFIG += console
CONFIG -= app_bundle
--- /dev/null
+TARGET = QtConcurrent
+QPRO_PWD = $$PWD
+QT = core-private
+
+CONFIG += module
+MODULE_PRI = ../modules/qt_concurrent.pri
+
+DEFINES += QT_BUILD_CONCURRENT_LIB QT_NO_USING_NAMESPACE
+win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x66000000
+
+unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore
+
+load(qt_module_config)
+
+HEADERS += $$QT_SOURCE_TREE/src/xml/qtconcurrentversion.h
+
+PRECOMPILED_HEADER = ../corelib/global/qt_pch.h
+
+SOURCES += \
+ qfuture.cpp \
+ qfutureinterface.cpp \
+ qfuturesynchronizer.cpp \
+ qfuturewatcher.cpp \
+ qtconcurrentfilter.cpp \
+ qtconcurrentmap.cpp \
+ qtconcurrentresultstore.cpp \
+ qtconcurrentthreadengine.cpp \
+ qtconcurrentiteratekernel.cpp \
+ qtconcurrentexception.cpp
+
+HEADERS += \
+ qfuture.h \
+ qfutureinterface.h \
+ qfuturesynchronizer.h \
+ qfuturewatcher.h \
+ qtconcurrentcompilertest.h \
+ qtconcurrentexception.h \
+ qtconcurrentfilter.h \
+ qtconcurrentfilterkernel.h \
+ qtconcurrentfunctionwrappers.h \
+ qtconcurrentiteratekernel.h \
+ qtconcurrentmap.h \
+ qtconcurrentmapkernel.h \
+ qtconcurrentmedian.h \
+ qtconcurrentreducekernel.h \
+ qtconcurrentresultstore.h \
+ qtconcurrentrun.h \
+ qtconcurrentrunbase.h \
+ qtconcurrentstoredfunctioncall.h \
+ qtconcurrentthreadengine.h
+
+# private headers
+HEADERS += \
+ qfutureinterface_p.h \
+ qfuturewatcher_p.h
+
+contains(QT_CONFIG, clock-gettime) {
+ linux-*|hpux-*|solaris-*:LIBS *= -lrt
+}
#ifndef QT_NO_QFUTURE
-#include <QtCore/qfutureinterface.h>
+#include <QtConcurrent/qfutureinterface.h>
#include <QtCore/qstring.h>
-#include <QtCore/qtconcurrentcompilertest.h>
+#include <QtConcurrent/qtconcurrentcompilertest.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
#ifndef QT_NO_QFUTURE
#include <QtCore/qmutex.h>
-#include <QtCore/qtconcurrentexception.h>
-#include <QtCore/qtconcurrentresultstore.h>
+#include <QtConcurrent/qtconcurrentexception.h>
+#include <QtConcurrent/qtconcurrentresultstore.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
#ifndef QFUTRUESYNCHRONIZER_H
#define QFUTRUESYNCHRONIZER_H
-#include <QtCore/qfuture.h>
+#include <QtConcurrent/qfuture.h>
#ifndef QT_NO_CONCURRENT
#ifndef QFUTUREWATCHER_H
#define QFUTUREWATCHER_H
-#include <QtCore/qfuture.h>
+#include <QtConcurrent/qfuture.h>
#ifndef QT_NO_QFUTURE
#ifndef QT_NO_CONCURRENT
-#include <QtCore/qtconcurrentfilterkernel.h>
-#include <QtCore/qtconcurrentfunctionwrappers.h>
+#include <QtConcurrent/qtconcurrentfilterkernel.h>
+#include <QtConcurrent/qtconcurrentfunctionwrappers.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
#ifndef QT_NO_CONCURRENT
-#include <QtCore/qtconcurrentiteratekernel.h>
-#include <QtCore/qtconcurrentmapkernel.h>
-#include <QtCore/qtconcurrentreducekernel.h>
+#include <QtConcurrent/qtconcurrentiteratekernel.h>
+#include <QtConcurrent/qtconcurrentmapkernel.h>
+#include <QtConcurrent/qtconcurrentreducekernel.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
#ifndef QT_NO_CONCURRENT
#include <QtCore/qatomic.h>
-#include <QtCore/qtconcurrentmedian.h>
-#include <QtCore/qtconcurrentthreadengine.h>
+#include <QtConcurrent/qtconcurrentmedian.h>
+#include <QtConcurrent/qtconcurrentthreadengine.h>
#ifndef QT_NO_STL
# include <iterator>
#ifndef QT_NO_CONCURRENT
-#include <QtCore/qtconcurrentmapkernel.h>
-#include <QtCore/qtconcurrentreducekernel.h>
-#include <QtCore/qtconcurrentfunctionwrappers.h>
+#include <QtConcurrent/qtconcurrentmapkernel.h>
+#include <QtConcurrent/qtconcurrentreducekernel.h>
+#include <QtConcurrent/qtconcurrentfunctionwrappers.h>
#include <QtCore/qstringlist.h>
QT_BEGIN_HEADER
#ifndef QT_NO_CONCURRENT
-#include <QtCore/qtconcurrentiteratekernel.h>
-#include <QtCore/qtconcurrentreducekernel.h>
+#include <QtConcurrent/qtconcurrentiteratekernel.h>
+#include <QtConcurrent/qtconcurrentreducekernel.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
#ifndef QT_NO_CONCURRENT
-#include <QtCore/qtconcurrentrunbase.h>
-#include <QtCore/qtconcurrentstoredfunctioncall.h>
+#include <QtConcurrent/qtconcurrentrunbase.h>
+#include <QtConcurrent/qtconcurrentstoredfunctioncall.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
#ifndef QT_NO_CONCURRENT
-#include <QtCore/qfuture.h>
+#include <QtConcurrent/qfuture.h>
#include <QtCore/qrunnable.h>
#include <QtCore/qthreadpool.h>
#include <QtCore/qglobal.h>
#ifndef QT_NO_CONCURRENT
-#include <QtCore/qtconcurrentrunbase.h>
+#include <QtConcurrent/qtconcurrentrunbase.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
#ifndef QT_NO_CONCURRENT
#include <QtCore/qthreadpool.h>
-#include <QtCore/qfuture.h>
+#include <QtConcurrent/qfuture.h>
#include <QtCore/qdebug.h>
-#include <QtCore/qtconcurrentexception.h>
+#include <QtConcurrent/qtconcurrentexception.h>
#include <QtCore/qwaitcondition.h>
#include <QtCore/qatomic.h>
#include <QtCore/qsemaphore.h>
+++ /dev/null
-SOURCES += \
- concurrent/qfuture.cpp \
- concurrent/qfutureinterface.cpp \
- concurrent/qfuturesynchronizer.cpp \
- concurrent/qfuturewatcher.cpp \
- concurrent/qrunnable.cpp \
- concurrent/qtconcurrentfilter.cpp \
- concurrent/qtconcurrentmap.cpp \
- concurrent/qtconcurrentresultstore.cpp \
- concurrent/qtconcurrentthreadengine.cpp \
- concurrent/qtconcurrentiteratekernel.cpp \
- concurrent/qtconcurrentexception.cpp \
- concurrent/qthreadpool.cpp
-
-HEADERS += \
- concurrent/qfuture.h \
- concurrent/qfutureinterface.h \
- concurrent/qfuturesynchronizer.h \
- concurrent/qfuturewatcher.h \
- concurrent/qrunnable.h \
- concurrent/qtconcurrentcompilertest.h \
- concurrent/qtconcurrentexception.h \
- concurrent/qtconcurrentfilter.h \
- concurrent/qtconcurrentfilterkernel.h \
- concurrent/qtconcurrentfunctionwrappers.h \
- concurrent/qtconcurrentiteratekernel.h \
- concurrent/qtconcurrentmap.h \
- concurrent/qtconcurrentmapkernel.h \
- concurrent/qtconcurrentmedian.h \
- concurrent/qtconcurrentreducekernel.h \
- concurrent/qtconcurrentresultstore.h \
- concurrent/qtconcurrentrun.h \
- concurrent/qtconcurrentrunbase.h \
- concurrent/qtconcurrentstoredfunctioncall.h \
- concurrent/qtconcurrentthreadengine.h \
- concurrent/qthreadpool.h
-
-# private headers
-HEADERS += \
- concurrent/qfutureinterface_p.h \
- concurrent/qfuturewatcher_p.h \
- concurrent/qthreadpool_p.h
include(animation/animation.pri)
include(arch/arch.pri)
-include(concurrent/concurrent.pri)
include(global/global.pri)
include(thread/thread.pri)
include(tools/tools.pri)
# define Q_DBUS_EXPORT Q_DECL_IMPORT
# endif
# define Q_TEMPLATEDLL
+# if defined(QT_BUILD_CONCURRENT_LIB)
+# define Q_CONCURRENT_EXPORT Q_DECL_EXPORT
+# else
+# define Q_CONCURRENT_EXPORT Q_DECL_IMPORT
+# endif
# elif defined(QT_DLL) /* use a Qt DLL library */
# define Q_CORE_EXPORT Q_DECL_IMPORT
# define Q_GUI_EXPORT Q_DECL_IMPORT
# define Q_SCRIPTTOOLS_EXPORT Q_DECL_IMPORT
# define Q_COMPAT_EXPORT Q_DECL_IMPORT
# define Q_DBUS_EXPORT Q_DECL_IMPORT
+# define Q_CONCURRENT_EXPORT Q_DECL_IMPORT
# define Q_TEMPLATEDLL
# endif
# define Q_NO_DECLARED_NOT_DEFINED
# define Q_SCRIPTTOOLS_EXPORT Q_DECL_EXPORT
# define Q_COMPAT_EXPORT Q_DECL_EXPORT
# define Q_DBUS_EXPORT Q_DECL_EXPORT
+# define Q_CONCURRENT_EXPORT Q_DECL_EXPORT
# else
# define Q_CORE_EXPORT
# define Q_GUI_EXPORT
# define Q_SCRIPTTOOLS_EXPORT
# define Q_COMPAT_EXPORT
# define Q_DBUS_EXPORT
+# define Q_CONCURRENT_EXPORT
# endif
#endif
QCoreApplicationPrivate::is_app_running = false;
#if !defined(QT_NO_THREAD)
-#if !defined(QT_NO_CONCURRENT)
// Synchronize and stop the global thread pool threads.
QThreadPool *globalThreadPool = 0;
QT_TRY {
}
if (globalThreadPool)
globalThreadPool->waitForDone();
-#endif
QThread::cleanup();
#endif
QT_BEGIN_NAMESPACE
class QThreadPoolThread;
-class QThreadPoolPrivate : public QObjectPrivate
+class Q_CORE_EXPORT QThreadPoolPrivate : public QObjectPrivate
{
Q_DECLARE_PUBLIC(QThreadPool)
friend class QThreadPoolThread;
# public headers
HEADERS += thread/qmutex.h \
+ thread/qrunnable.h \
thread/qreadwritelock.h \
thread/qsemaphore.h \
thread/qthread.h \
+ thread/qthreadpool.h \
thread/qthreadstorage.h \
thread/qwaitcondition.h \
thread/qatomic.h \
thread/qmutexpool_p.h \
thread/qorderedmutexlocker_p.h \
thread/qreadwritelock_p.h \
- thread/qthread_p.h
+ thread/qthread_p.h \
+ thread/qthreadpool_p.h
SOURCES += thread/qatomic.cpp \
thread/qmutex.cpp \
thread/qreadwritelock.cpp \
+ thread/qrunnable.cpp \
thread/qmutexpool.cpp \
thread/qsemaphore.cpp \
thread/qthread.cpp \
+ thread/qthreadpool.cpp \
thread/qthreadstorage.cpp
unix:SOURCES += thread/qthread_unix.cpp \
--- /dev/null
+QT.concurrent.VERSION = 5.0.0
+QT.concurrent.MAJOR_VERSION = 5
+QT.concurrent.MINOR_VERSION = 0
+QT.concurrent.PATCH_VERSION = 0
+
+QT.concurrent.name = QtConcurrent
+QT.concurrent.bins = $$QT_MODULE_BIN_BASE
+QT.concurrent.includes = $$QT_MODULE_INCLUDE_BASE/QtConcurrent
+QT.concurrent.private_includes = $$QT_MODULE_INCLUDE_BASE/QtConcurrent/$$QT.concurrent.VERSION
+QT.concurrent.sources = $$QT_MODULE_BASE/src/concurrent
+QT.concurrent.libs = $$QT_MODULE_LIB_BASE
+QT.concurrent.plugins = $$QT_MODULE_PLUGIN_BASE
+QT.concurrent.imports = $$QT_MODULE_IMPORT_BASE
+QT.concurrent.depends = core
+QT.concurrent.DEFINES = QT_CONCURRENT_LIB
SRC_SUBDIRS += src_network src_sql src_gui src_xml src_widgets src_printsupport src_testlib src_platformsupport
nacl: SRC_SUBDIRS -= src_network src_testlib
contains(QT_CONFIG, dbus):SRC_SUBDIRS += src_dbus
+contains(QT_CONFIG, concurrent):SRC_SUBDIRS += src_concurrent
contains(QT_CONFIG, no-gui): SRC_SUBDIRS -= src_gui
src_testlib.target = sub-testlib
src_platformsupport.subdir = $$QT_SOURCE_TREE/src/platformsupport
src_platformsupport.target = sub-platformsupport
+src_concurrent.subdir = $$QT_SOURCE_TREE/src/concurrent
+src_concurrent.target = sub-concurrent
#CONFIG += ordered
src_platformsupport.depends = src_corelib src_gui src_network
src_widgets.depends = src_corelib src_gui src_tools_uic
src_xml.depends = src_corelib
+ src_concurrent.depends = src_corelib
src_dbus.depends = src_corelib
src_network.depends = src_corelib
src_opengl.depends = src_gui src_widgets
"QtNetwork" => "$basedir/src/network",
"QtTest" => "$basedir/src/testlib",
"QtDBus" => "$basedir/src/dbus",
+ "QtConcurrent" => "$basedir/src/concurrent",
"QtPlatformSupport" => "$basedir/src/platformsupport",
);
%moduleheaders = ( # restrict the module headers to those found in relative path
"qtxmlversion.h" => "QtXmlVersion",
"qtwidgetsversion.h" => "QtWidgetsVersion",
"qtprintsupportversion.h" => "QtPrintSupportVersion",
+ "qtconcurrentversion.h" => "QtConcurrentVersion",
"qtplatformsupportversion.h" => "QtPlatformSupportVersion",
);
%mastercontent = (
"network" => "#include <QtNetwork/QtNetwork>\n",
"opengl" => "#include <QtOpenGL/QtOpenGL>\n",
"xml" => "#include <QtXml/QtXml>\n",
+ "concurrent" => "#include <QtConcurrent/QtConcurrent>\n",
);
%modulepris = (
"QtCore" => "$basedir/src/modules/qt_core.pri",
"QtSql" => "$basedir/src/modules/qt_sql.pri",
"QtTest" => "$basedir/src/modules/qt_testlib.pri",
"QtXml" => "$basedir/src/modules/qt_xml.pri",
+ "QtConcurrent" => "$basedir/src/modules/qt_concurrent.pri",
"QtPlatformSupport" => "$basedir/src/modules/qt_platformsupport.pri",
);
%explicitheaders = (
testlib \
tools \
xml \
+ concurrent \
other \
widgets \
mac {
network.CONFIG += no_check_target
}
+
+!contains(QT_CONFIG, concurrent): SUBDIRS -= concurrent
+
qtconcurrentmap \
qtconcurrentresultstore \
qtconcurrentrun \
- qtconcurrentthreadengine \
- qthreadpool
+ qtconcurrentthreadengine
CONFIG += testcase parallel_test
TARGET = tst_qfuture
-QT = core-private testlib
+QT = concurrent-private testlib concurrent
SOURCES = tst_qfuture.cpp
DEFINES += QT_STRICT_ITERATORS
CONFIG += testcase parallel_test
TARGET = tst_qfuturesynchronizer
-QT = core testlib
+QT = core testlib concurrent
SOURCES = tst_qfuturesynchronizer.cpp
#include <QtTest>
-#include <QtCore/qfuturesynchronizer.h>
-#include <QtCore/qfuture.h>
+#include <QtConcurrent/qfuturesynchronizer.h>
+#include <QtConcurrent/qfuture.h>
class tst_QFutureSynchronizer : public QObject
{
CONFIG += testcase parallel_test
TARGET = tst_qfuturewatcher
-QT = core-private testlib
+QT = concurrent-private testlib concurrent
SOURCES = tst_qfuturewatcher.cpp
#include <QDebug>
#include <QtTest/QtTest>
-#include <qfuture.h>
-#include <qfuturewatcher.h>
-#include <qtconcurrentrun.h>
-#include <qtconcurrentmap.h>
+#include <QtConcurrent>
#include <private/qfutureinterface_p.h>
using namespace QtConcurrent;
CONFIG += testcase parallel_test
TARGET = tst_qtconcurrentfilter
-QT = core testlib
+QT = core testlib concurrent
SOURCES = tst_qtconcurrentfilter.cpp
DEFINES += QT_STRICT_ITERATORS
CONFIG += testcase parallel_test
TARGET = tst_qtconcurrentiteratekernel
-QT = core testlib
+QT = core testlib concurrent
SOURCES = tst_qtconcurrentiteratekernel.cpp
CONFIG += testcase parallel_test
TARGET = tst_qtconcurrentmap
-QT = core testlib
+QT = core testlib concurrent
SOURCES = tst_qtconcurrentmap.cpp
DEFINES += QT_STRICT_ITERATORS
CONFIG += testcase parallel_test
TARGET = tst_qtconcurrentresultstore
-QT = core-private testlib
+QT = core-private testlib concurrent
SOURCES = tst_qtconcurrentresultstore.cpp
DEFINES += QT_STRICT_ITERATORS
CONFIG += testcase parallel_test
TARGET = tst_qtconcurrentrun
-QT = core testlib
+QT = core testlib concurrent
SOURCES = tst_qtconcurrentrun.cpp
CONFIG += testcase parallel_test
TARGET = tst_qtconcurrentthreadengine
-QT = core testlib
+QT = core testlib concurrent
SOURCES = tst_qtconcurrentthreadengine.cpp
#include <qtextdocument.h>
#include <time.h>
#include <qprocess.h>
-#include <QtConcurrentMap>
#include <QThreadPool>
class tst_QTextCodec : public QObject
Q_OBJECT
private slots:
-#ifndef QT_NO_CONCURRENT
void threadSafety();
-#endif
void toUnicode_data();
void toUnicode();
}
#endif
-static QByteArray loadAndConvert(const QByteArray &codecName)
+class LoadAndConvert: public QRunnable
{
- QTextCodec *c = QTextCodec::codecForName(codecName);
- if (!c) {
- qWarning() << "WARNING" << codecName << "not found?";
- return QByteArray();
+public:
+ LoadAndConvert(const QByteArray &source, QByteArray *destination)
+ : codecName(source), target(destination)
+ {}
+ QByteArray codecName;
+ QByteArray *target;
+ void run()
+ {
+ QTextCodec *c = QTextCodec::codecForName(codecName);
+ if (!c) {
+ qWarning() << "WARNING" << codecName << "not found?";
+ return;
+ }
+ QString str = QString::fromLatin1(codecName);
+ QByteArray b = c->fromUnicode(str);
+ c->toUnicode(b);
+ *target = codecName;
}
- QString str = QString::fromLatin1(codecName);
- QByteArray b = c->fromUnicode(str);
- c->toUnicode(b);
- return codecName;
-}
+};
-static int loadAndConvertMIB(int mib)
+class LoadAndConvertMIB: public QRunnable
{
- QTextCodec *c = QTextCodec::codecForMib(mib);
- if (!c) {
- qWarning() << "WARNING" << mib << "not found?";
- return 0;
+public:
+ LoadAndConvertMIB(int mib, int *target)
+ : mib(mib), target(target)
+ {}
+ int mib;
+ int *target;
+ void run()
+ {
+ QTextCodec *c = QTextCodec::codecForMib(mib);
+ if (!c) {
+ qWarning() << "WARNING" << mib << "not found?";
+ return;
+ }
+ QString str = QString::number(mib);
+ QByteArray b = c->fromUnicode(str);
+ c->toUnicode(b);
+ *target = mib;
}
- QString str = QString::number(mib);
- QByteArray b = c->fromUnicode(str);
- c->toUnicode(b);
- return mib;
-}
+};
-#ifndef QT_NO_CONCURRENT
void tst_QTextCodec::threadSafety()
{
QList<QByteArray> codecList = QTextCodec::availableCodecs();
QList<int> mibList = QTextCodec::availableMibs();
QThreadPool::globalInstance()->setMaxThreadCount(12);
- QFuture<QByteArray> res = QtConcurrent::mapped(codecList, loadAndConvert);
+ QVector<QByteArray> res;
+ res.resize(codecList.size());
+ for (int i = 0; i < codecList.size(); ++i) {
+ QThreadPool::globalInstance()->start(new LoadAndConvert(codecList.at(i), &res[i]));
+ }
- QFuture<int> res2 = QtConcurrent::mapped(mibList, loadAndConvertMIB);
+ QVector<int> res2;
+ res2.resize(mibList.size());
+ for (int i = 0; i < mibList.size(); ++i) {
+ QThreadPool::globalInstance()->start(new LoadAndConvertMIB(mibList.at(i), &res2[i]));
+ }
+
+ // wait for all threads to finish working
+ QThreadPool::globalInstance()->waitForDone();
- QCOMPARE(res.results(), codecList);
- QCOMPARE(res2.results(), mibList);
+ QCOMPARE(res.toList(), codecList);
+ QCOMPARE(res2.toList(), mibList);
}
-#endif
void tst_QTextCodec::invalidNames()
{
SUBDIRS=\
animation \
codecs \
- concurrent \
global \
io \
itemmodels \
tools \
xml
-!contains(QT_CONFIG, concurrent): SUBDIRS -= concurrent
qsemaphore \
qthread \
qthreadonce \
+ qthreadpool \
qthreadstorage \
qwaitcondition \
qwritelocker