1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make QThreadPoolPrivate use NSDMIs

Browse Source 
(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:
Morten Johan Sørvig 2017-07-20 12:07:08 +02:00
parent bef7e4a222
commit 5c9c55906c
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/corelib/thread/qthreadpool.cpp
View File

@ -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)

11
src/corelib/thread/qthreadpool_p.h
View File

@ -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