Make QThreadPoolPrivate use NSDMIs
(non static data member initializers) Also, taking the absolute value of the idealThreadCount() return value is no longer needed since the function now returns 1 for the "CPU detection failure" case. Change-Id: I2214fd15ed24413bba796ead38bbf1355dfd37d9 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
This commit is contained in:
parent
bef7e4a222
commit
5c9c55906c
@ -154,11 +154,6 @@ void QThreadPoolThread::registerThreadInactive()
|
|||||||
\internal
|
\internal
|
||||||
*/
|
*/
|
||||||
QThreadPoolPrivate:: QThreadPoolPrivate()
|
QThreadPoolPrivate:: QThreadPoolPrivate()
|
||||||
: isExiting(false),
|
|
||||||
expiryTimeout(30000),
|
|
||||||
maxThreadCount(qAbs(QThread::idealThreadCount())),
|
|
||||||
reservedThreads(0),
|
|
||||||
activeThreads(0)
|
|
||||||
{ }
|
{ }
|
||||||
|
|
||||||
bool QThreadPoolPrivate::tryStart(QRunnable *task)
|
bool QThreadPoolPrivate::tryStart(QRunnable *task)
|
||||||
|
@ -53,6 +53,7 @@
|
|||||||
//
|
//
|
||||||
|
|
||||||
#include "QtCore/qmutex.h"
|
#include "QtCore/qmutex.h"
|
||||||
|
#include "QtCore/qthread.h"
|
||||||
#include "QtCore/qwaitcondition.h"
|
#include "QtCore/qwaitcondition.h"
|
||||||
#include "QtCore/qset.h"
|
#include "QtCore/qset.h"
|
||||||
#include "QtCore/qqueue.h"
|
#include "QtCore/qqueue.h"
|
||||||
@ -91,11 +92,11 @@ public:
|
|||||||
QVector<QPair<QRunnable *, int> > queue;
|
QVector<QPair<QRunnable *, int> > queue;
|
||||||
QWaitCondition noActiveThreads;
|
QWaitCondition noActiveThreads;
|
||||||
|
|
||||||
bool isExiting;
|
int expiryTimeout = 30000;
|
||||||
int expiryTimeout;
|
int maxThreadCount = QThread::idealThreadCount();
|
||||||
int maxThreadCount;
|
int reservedThreads = 0;
|
||||||
int reservedThreads;
|
int activeThreads = 0;
|
||||||
int activeThreads;
|
bool isExiting = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
QT_END_NAMESPACE
|
QT_END_NAMESPACE
|
||||||
|
Loading…
x
Reference in New Issue
Block a user