diff options
| author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-05-28 13:26:39 +0200 |
|---|---|---|
| committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-05-28 15:12:29 +0200 |
| commit | 9aea74f2c6dac24a841554fdd47798e2f75f395c (patch) | |
| tree | 2d821555af4468a8b96687c40d1a547d8971fe8b /src/concurrent | |
| parent | b6a2962a52db4f1d704e4ff68cede40ec13df60c (diff) | |
Pass the thread pool into BlockSizeManager
This was overlooked when enabling setting a custom thread pool
for various concurrent methods.
Fixes: QTBUG-53465
Change-Id: I8b0a0086e46639639051fe99cf52d049f7bb3bb2
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
Diffstat (limited to 'src/concurrent')
| -rw-r--r-- | src/concurrent/qtconcurrentiteratekernel.cpp | 4 | ||||
| -rw-r--r-- | src/concurrent/qtconcurrentiteratekernel.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/concurrent/qtconcurrentiteratekernel.cpp b/src/concurrent/qtconcurrentiteratekernel.cpp index 45b54ecfdc..430ae89c85 100644 --- a/src/concurrent/qtconcurrentiteratekernel.cpp +++ b/src/concurrent/qtconcurrentiteratekernel.cpp @@ -102,8 +102,8 @@ namespace QtConcurrent { /*! \internal */ -BlockSizeManager::BlockSizeManager(int iterationCount) - : maxBlockSize(iterationCount / (QThreadPool::globalInstance()->maxThreadCount() * 2)), +BlockSizeManager::BlockSizeManager(QThreadPool *pool, int iterationCount) + : maxBlockSize(iterationCount / (pool->maxThreadCount() * 2)), beforeUser(0), afterUser(0), m_blockSize(1) { } diff --git a/src/concurrent/qtconcurrentiteratekernel.h b/src/concurrent/qtconcurrentiteratekernel.h index 6ea96f5097..a8decf5cf8 100644 --- a/src/concurrent/qtconcurrentiteratekernel.h +++ b/src/concurrent/qtconcurrentiteratekernel.h @@ -67,7 +67,7 @@ namespace QtConcurrent { class Q_CONCURRENT_EXPORT BlockSizeManager { public: - explicit BlockSizeManager(int iterationCount); + explicit BlockSizeManager(QThreadPool *pool, int iterationCount); void timeBeforeUser(); void timeAfterUser(); @@ -198,7 +198,7 @@ public: ThreadFunctionResult forThreadFunction() { - BlockSizeManager blockSizeManager(iterationCount); + BlockSizeManager blockSizeManager(ThreadEngineBase::threadPool, iterationCount); ResultReporter<T> resultReporter(this); for(;;) { |