whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reorder IterateKernel data members to avoid holes in the data 

Change-Id: I7661eaa6b14b7a7b930390e6bb8c6894f4a91846
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
bb10
Sona Kurazyan 2020-11-09 15:53:53 +01:00
parent 8186f18c4a
commit 7b1bbdb10c
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/concurrent/qtconcurrentiteratekernel.h
View File

@ -155,13 +155,15 @@ inline bool selectIteration(std::random_access_iterator_tag)
template <typename Iterator, typename T>
class IterateKernel : public ThreadEngine<T>
{
using IteratorCategory = typename std::iterator_traits<Iterator>::iterator_category;
public:
typedef T ResultType;
IterateKernel(QThreadPool *pool, Iterator _begin, Iterator _end)
: ThreadEngine<T>(pool), begin(_begin), end(_end), current(_begin), currentIndex(0)
, forIteration(selectIteration(typename std::iterator_traits<Iterator>::iterator_category()))
, iterationCount(forIteration ? std::distance(_begin, _end) : 0)
: ThreadEngine<T>(pool), begin(_begin), end(_end), current(_begin)
, iterationCount(selectIteration(IteratorCategory()) ? std::distance(_begin, _end) : 0)
, forIteration(selectIteration(IteratorCategory()))
, progressReportingEnabled(true)
{
}
@ -287,12 +289,11 @@ public:
const Iterator end;
Iterator current;
QAtomicInt currentIndex;
const bool forIteration;
QAtomicInt iteratorThreads;
const int iterationCount;
bool progressReportingEnabled;
QAtomicInt completed;
const int iterationCount;
const bool forIteration;
bool progressReportingEnabled;
};
} // namespace QtConcurrent