From a65a98399bf45924eb4d9394cf1e905b489639cc Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Mon, 27 Aug 2012 17:23:33 +0200 Subject: Move QtConcurrent::ResultStore as QtPrivate::ResultStore to QtCore No compatibility header needed. While this wasn't marked as private API, it wasn't documented, either. This is a prerequisite for moving QFuture to QtCore. Change-Id: I8e986e6e2a22fbe5cf08d0600ec39ae9ae993e20 Reviewed-by: Thiago Macieira --- src/concurrent/concurrent.pro | 2 - src/concurrent/qfutureinterface.cpp | 6 +- src/concurrent/qfutureinterface.h | 20 +-- src/concurrent/qfutureinterface_p.h | 2 +- src/concurrent/qtconcurrentresultstore.cpp | 256 ----------------------------- src/concurrent/qtconcurrentresultstore.h | 238 --------------------------- 6 files changed, 14 insertions(+), 510 deletions(-) delete mode 100644 src/concurrent/qtconcurrentresultstore.cpp delete mode 100644 src/concurrent/qtconcurrentresultstore.h (limited to 'src/concurrent') diff --git a/src/concurrent/concurrent.pro b/src/concurrent/concurrent.pro index 772146f682..d21dff91dd 100644 --- a/src/concurrent/concurrent.pro +++ b/src/concurrent/concurrent.pro @@ -18,7 +18,6 @@ SOURCES += \ qfuturewatcher.cpp \ qtconcurrentfilter.cpp \ qtconcurrentmap.cpp \ - qtconcurrentresultstore.cpp \ qtconcurrentthreadengine.cpp \ qtconcurrentiteratekernel.cpp \ @@ -38,7 +37,6 @@ HEADERS += \ qtconcurrentmapkernel.h \ qtconcurrentmedian.h \ qtconcurrentreducekernel.h \ - qtconcurrentresultstore.h \ qtconcurrentrun.h \ qtconcurrentrunbase.h \ qtconcurrentstoredfunctioncall.h \ diff --git a/src/concurrent/qfutureinterface.cpp b/src/concurrent/qfutureinterface.cpp index 1f675525a5..2c33418ee9 100644 --- a/src/concurrent/qfutureinterface.cpp +++ b/src/concurrent/qfutureinterface.cpp @@ -395,12 +395,12 @@ QtPrivate::ExceptionStore &QFutureInterfaceBase::exceptionStore() return d->m_exceptionStore; } -QtConcurrent::ResultStoreBase &QFutureInterfaceBase::resultStoreBase() +QtPrivate::ResultStoreBase &QFutureInterfaceBase::resultStoreBase() { return d->m_results; } -const QtConcurrent::ResultStoreBase &QFutureInterfaceBase::resultStoreBase() const +const QtPrivate::ResultStoreBase &QFutureInterfaceBase::resultStoreBase() const { return d->m_results; } @@ -522,7 +522,7 @@ void QFutureInterfaceBasePrivate::connectOutputInterface(QFutureCallOutInterface m_progressText)); } - QtConcurrent::ResultIteratorBase it = m_results.begin(); + QtPrivate::ResultIteratorBase it = m_results.begin(); while (it != m_results.end()) { const int begin = it.resultIndex(); const int end = begin + it.batchSize(); diff --git a/src/concurrent/qfutureinterface.h b/src/concurrent/qfutureinterface.h index 615b9fbe6a..e9d8d37b67 100644 --- a/src/concurrent/qfutureinterface.h +++ b/src/concurrent/qfutureinterface.h @@ -50,7 +50,7 @@ #include #include -#include +#include QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -123,8 +123,8 @@ public: QMutex *mutex() const; QtPrivate::ExceptionStore &exceptionStore(); - QtConcurrent::ResultStoreBase &resultStoreBase(); - const QtConcurrent::ResultStoreBase &resultStoreBase() const; + QtPrivate::ResultStoreBase &resultStoreBase(); + const QtPrivate::ResultStoreBase &resultStoreBase() const; inline bool operator==(const QFutureInterfaceBase &other) const { return d == other.d; } inline bool operator!=(const QFutureInterfaceBase &other) const { return d != other.d; } @@ -182,10 +182,10 @@ public: inline const T *resultPointer(int index) const; inline QList results(); private: - QtConcurrent::ResultStore &resultStore() - { return static_cast &>(resultStoreBase()); } - const QtConcurrent::ResultStore &resultStore() const - { return static_cast &>(resultStoreBase()); } + QtPrivate::ResultStore &resultStore() + { return static_cast &>(resultStoreBase()); } + const QtPrivate::ResultStore &resultStore() const + { return static_cast &>(resultStoreBase()); } }; template @@ -196,7 +196,7 @@ inline void QFutureInterface::reportResult(const T *result, int index) return; } - QtConcurrent::ResultStore &store = resultStore(); + QtPrivate::ResultStore &store = resultStore(); if (store.filterMode()) { @@ -223,7 +223,7 @@ inline void QFutureInterface::reportResults(const QVector &_results, int b return; } - QtConcurrent::ResultStore &store = resultStore(); + QtPrivate::ResultStore &store = resultStore(); if (store.filterMode()) { const int resultCountBefore = store.count(); @@ -269,7 +269,7 @@ inline QList QFutureInterface::results() QList res; QMutexLocker lock(mutex()); - QtConcurrent::ResultIterator it = resultStore().begin(); + QtPrivate::ResultIterator it = resultStore().begin(); while (it != resultStore().end()) { res.append(it.value()); ++it; diff --git a/src/concurrent/qfutureinterface_p.h b/src/concurrent/qfutureinterface_p.h index 734584adad..7fd2ea4d99 100644 --- a/src/concurrent/qfutureinterface_p.h +++ b/src/concurrent/qfutureinterface_p.h @@ -142,7 +142,7 @@ public: QElapsedTimer progressTime; QWaitCondition pausedWaitCondition; int pendingResults; - QtConcurrent::ResultStoreBase m_results; + QtPrivate::ResultStoreBase m_results; bool manualProgress; int m_expectedResultCount; QtPrivate::ExceptionStore m_exceptionStore; diff --git a/src/concurrent/qtconcurrentresultstore.cpp b/src/concurrent/qtconcurrentresultstore.cpp deleted file mode 100644 index 14a1d0f5e1..0000000000 --- a/src/concurrent/qtconcurrentresultstore.cpp +++ /dev/null @@ -1,256 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "qtconcurrentresultstore.h" - -#ifndef QT_NO_QFUTURE - -QT_BEGIN_NAMESPACE - -namespace QtConcurrent { - -ResultIteratorBase::ResultIteratorBase() - : mapIterator(QMap::const_iterator()), m_vectorIndex(0) { } -ResultIteratorBase::ResultIteratorBase(QMap::const_iterator _mapIterator, int _vectorIndex) - : mapIterator(_mapIterator), m_vectorIndex(_vectorIndex) { } - -int ResultIteratorBase::vectorIndex() const { return m_vectorIndex; } -int ResultIteratorBase::resultIndex() const { return mapIterator.key() + m_vectorIndex; } - -ResultIteratorBase ResultIteratorBase::operator++() -{ - if (canIncrementVectorIndex()) { - ++m_vectorIndex; - } else { - ++mapIterator; - m_vectorIndex = 0; - } - return *this; -} - -int ResultIteratorBase::batchSize() const -{ - return mapIterator.value().count(); -} - -void ResultIteratorBase::batchedAdvance() -{ - ++mapIterator; - m_vectorIndex = 0; -} - -bool ResultIteratorBase::operator==(const ResultIteratorBase &other) const -{ - return (mapIterator == other.mapIterator && m_vectorIndex == other.m_vectorIndex); -} - -bool ResultIteratorBase::operator!=(const ResultIteratorBase &other) const -{ - return !operator==(other); -} - -bool ResultIteratorBase::isVector() const -{ - return mapIterator.value().isVector(); -} - -bool ResultIteratorBase::canIncrementVectorIndex() const -{ - return (m_vectorIndex + 1 < mapIterator.value().m_count); -} - -ResultStoreBase::ResultStoreBase() - : insertIndex(0), resultCount(0), m_filterMode(false), filteredResults(0) { } - -void ResultStoreBase::setFilterMode(bool enable) -{ - m_filterMode = enable; -} - -bool ResultStoreBase::filterMode() const -{ - return m_filterMode; -} - -void ResultStoreBase::syncResultCount() -{ - ResultIteratorBase it = resultAt(resultCount); - while (it != end()) { - resultCount += it.batchSize(); - it = resultAt(resultCount); - } -} - -void ResultStoreBase::insertResultItemIfValid(int index, ResultItem &resultItem) -{ - if (resultItem.isValid()) { - m_results[index] = resultItem; - syncResultCount(); - } else { - filteredResults += resultItem.count(); - } -} - -int ResultStoreBase::insertResultItem(int index, ResultItem &resultItem) -{ - int storeIndex; - if (m_filterMode && index != -1 && index > insertIndex) { - pendingResults[index] = resultItem; - storeIndex = index; - } else { - storeIndex = updateInsertIndex(index, resultItem.count()); - insertResultItemIfValid(storeIndex - filteredResults, resultItem); - } - syncPendingResults(); - return storeIndex; -} - -void ResultStoreBase::syncPendingResults() -{ - // check if we can insert any of the pending results: - QMap::iterator it = pendingResults.begin(); - while (it != pendingResults.end()) { - int index = it.key(); - if (index != resultCount + filteredResults) - break; - - ResultItem result = it.value(); - insertResultItemIfValid(index - filteredResults, result); - pendingResults.erase(it); - it = pendingResults.begin(); - } -} - -int ResultStoreBase::addResult(int index, const void *result) -{ - ResultItem resultItem(result, 0); // 0 means "not a vector" - return insertResultItem(index, resultItem); -} - -int ResultStoreBase::addResults(int index, const void *results, int vectorSize, int totalCount) -{ - if (m_filterMode == false || vectorSize == totalCount) { - ResultItem resultItem(results, vectorSize); - return insertResultItem(index, resultItem); - } else { - if (vectorSize > 0) { - ResultItem filteredIn(results, vectorSize); - insertResultItem(index, filteredIn); - } - ResultItem filteredAway(0, totalCount - vectorSize); - return insertResultItem(index + vectorSize, filteredAway); - } -} - -ResultIteratorBase ResultStoreBase::begin() const -{ - return ResultIteratorBase(m_results.begin()); -} - -ResultIteratorBase ResultStoreBase::end() const -{ - return ResultIteratorBase(m_results.end()); -} - -bool ResultStoreBase::hasNextResult() const -{ - return begin() != end(); -} - -ResultIteratorBase ResultStoreBase::resultAt(int index) const -{ - if (m_results.isEmpty()) - return ResultIteratorBase(m_results.end()); - QMap::const_iterator it = m_results.lowerBound(index); - - // lowerBound returns either an iterator to the result or an iterator - // to the nearest greater index. If the latter happens it might be - // that the result is stored in a vector at the previous index. - if (it == m_results.end()) { - --it; - if (it.value().isVector() == false) { - return ResultIteratorBase(m_results.end()); - } - } else { - if (it.key() > index) { - if (it == m_results.begin()) - return ResultIteratorBase(m_results.end()); - --it; - } - } - - const int vectorIndex = index - it.key(); - - if (vectorIndex >= it.value().count()) - return ResultIteratorBase(m_results.end()); - else if (it.value().isVector() == false && vectorIndex != 0) - return ResultIteratorBase(m_results.end()); - return ResultIteratorBase(it, vectorIndex); -} - -bool ResultStoreBase::contains(int index) const -{ - return (resultAt(index) != end()); -} - -int ResultStoreBase::count() const -{ - return resultCount; -} - -// returns the insert index, calling this function with -// index equal to -1 returns the next available index. -int ResultStoreBase::updateInsertIndex(int index, int _count) -{ - if (index == -1) { - index = insertIndex; - insertIndex += _count; - } else { - insertIndex = qMax(index + _count, insertIndex); - } - return index; -} - -} // namespace QtConcurrent - -QT_END_NAMESPACE - -#endif // QT_NO_CONCURRENT diff --git a/src/concurrent/qtconcurrentresultstore.h b/src/concurrent/qtconcurrentresultstore.h deleted file mode 100644 index bc02dbf0d4..0000000000 --- a/src/concurrent/qtconcurrentresultstore.h +++ /dev/null @@ -1,238 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QTCONCURRENT_RESULTSTORE_H -#define QTCONCURRENT_RESULTSTORE_H - -#include - -#ifndef QT_NO_QFUTURE - -#include -#include - -QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE - - -/* - ResultStore stores indexed results. Results can be added and retrieved - either individually batched in a QVector. Retriveing results and checking - which indexes are in the store can be done either by iterating or by random - accees. In addition results kan be removed from the front of the store, - either individually or in batches. -*/ - -#ifndef qdoc - -namespace QtConcurrent { - -class ResultItem -{ -public: - ResultItem(const void *_result, int _count) : m_count(_count), result(_result) { } // contruct with vector of results - ResultItem(const void *_result) : m_count(0), result(_result) { } // construct with result - ResultItem() : m_count(0), result(0) { } - bool isValid() const { return result != 0; } - bool isVector() const { return m_count != 0; } - int count() const { return (m_count == 0) ? 1 : m_count; } - int m_count; // result is either a pointer to a result or to a vector of results, - const void *result; // if count is 0 it's a result, otherwise it's a vector. -}; - -class Q_CONCURRENT_EXPORT ResultIteratorBase -{ -public: - ResultIteratorBase(); - ResultIteratorBase(QMap::const_iterator _mapIterator, int _vectorIndex = 0); - int vectorIndex() const; - int resultIndex() const; - - ResultIteratorBase operator++(); - int batchSize() const; - void batchedAdvance(); - bool operator==(const ResultIteratorBase &other) const; - bool operator!=(const ResultIteratorBase &other) const; - bool isVector() const; - bool canIncrementVectorIndex() const; -protected: - QMap::const_iterator mapIterator; - int m_vectorIndex; -}; - -template -class ResultIterator : public ResultIteratorBase -{ -public: - ResultIterator(const ResultIteratorBase &base) - : ResultIteratorBase(base) { } - - const T &value() const - { - return *pointer(); - } - - const T *pointer() const - { - if (mapIterator.value().isVector()) - return &(reinterpret_cast *>(mapIterator.value().result)->at(m_vectorIndex)); - else - return reinterpret_cast(mapIterator.value().result); - } -}; - -class Q_CONCURRENT_EXPORT ResultStoreBase -{ -public: - ResultStoreBase(); - void setFilterMode(bool enable); - bool filterMode() const; - int addResult(int index, const void *result); - int addResults(int index, const void *results, int vectorSize, int logicalCount); - ResultIteratorBase begin() const; - ResultIteratorBase end() const; - bool hasNextResult() const; - ResultIteratorBase resultAt(int index) const; - bool contains(int index) const; - int count() const; - virtual ~ResultStoreBase() { } - -protected: - int insertResultItem(int index, ResultItem &resultItem); - void insertResultItemIfValid(int index, ResultItem &resultItem); - void syncPendingResults(); - void syncResultCount(); - int updateInsertIndex(int index, int _count); - - QMap m_results; - int insertIndex; // The index where the next results(s) will be inserted. - int resultCount; // The number of consecutive results stored, starting at index 0. - - bool m_filterMode; - QMap pendingResults; - int filteredResults; - -}; - -template -class ResultStore : public ResultStoreBase -{ -public: - ResultStore() { } - - ResultStore(const ResultStoreBase &base) - : ResultStoreBase(base) { } - - int addResult(int index, const T *result) - { - if (result == 0) - return ResultStoreBase::addResult(index, result); - else - return ResultStoreBase::addResult(index, new T(*result)); - } - - int addResults(int index, const QVector *results) - { - return ResultStoreBase::addResults(index, new QVector(*results), results->count(), results->count()); - } - - int addResults(int index, const QVector *results, int totalCount) - { - return ResultStoreBase::addResults(index, new QVector(*results), results->count(), totalCount); - } - - int addCanceledResult(int index) - { - return addResult(index, 0); - } - - int addCanceledResults(int index, int _count) - { - QVector empty; - return addResults(index, &empty, _count); - } - - ResultIterator begin() const - { - return static_cast >(ResultStoreBase::begin()); - } - - ResultIterator end() const - { - return static_cast >(ResultStoreBase::end()); - } - - ResultIterator resultAt(int index) const - { - return static_cast >(ResultStoreBase::resultAt(index)); - } - - void clear() - { - QMap::const_iterator mapIterator = m_results.constBegin(); - while (mapIterator != m_results.constEnd()) { - if (mapIterator.value().isVector()) - delete reinterpret_cast *>(mapIterator.value().result); - else - delete reinterpret_cast(mapIterator.value().result); - ++mapIterator; - } - resultCount = 0; - m_results.clear(); - } - - ~ResultStore() - { - clear(); - } - -}; - -} // namespace QtConcurrent - -#endif //qdoc - -QT_END_NAMESPACE -QT_END_HEADER - -#endif // QT_NO_CONCURRENT - -#endif -- cgit v1.2.3