Fix QtConcurrent to properly work with functors
QtConcurrent reduce functions were requiring to explicitly pass the the result type when passing functors as reductor. This was because of inability to deduce the result type from the functors. The result type of the QtConcurrent reduce functions should match with the type of the fist argument of the operator() when a functor is passed. Reused the ArgResolver type trait (already used for QFuture and QtConcurrent::run) to find out the result type in that case. Task-number: QTBUG-88448 Change-Id: Ief0eeee197df8cb9c30f3403d71978f36e4fb0f2 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
This commit is contained in:
Sona Kurazyan
parent
1dcfb09c5b
commit
6ebe3d0f08
@ -148,8 +148,8 @@ QFuture<ResultType> filteredReduced(Sequence &&sequence,
|
||||
|
||||
#ifndef Q_CLANG_QDOC
|
||||
template <typename Sequence, typename KeepFunctor, typename ReduceFunctor,
|
||||
typename ResultType =
|
||||
typename QtPrivate::ReduceResultType<std::decay_t<ReduceFunctor>>::ResultType>
|
||||
std::enable_if_t<QtPrivate::isInvocable<KeepFunctor, Sequence>::value, int> = 0,
|
||||
typename ResultType = typename QtPrivate::ReduceResultTypeHelper<ReduceFunctor>::type>
|
||||
QFuture<ResultType> filteredReduced(QThreadPool *pool,
|
||||
Sequence &&sequence,
|
||||
KeepFunctor &&keep,
|
||||
@ -163,8 +163,8 @@ QFuture<ResultType> filteredReduced(QThreadPool *pool,
|
||||
}
|
||||
|
||||
template <typename Sequence, typename KeepFunctor, typename ReduceFunctor,
|
||||
typename ResultType =
|
||||
typename QtPrivate::ReduceResultType<std::decay_t<ReduceFunctor>>::ResultType>
|
||||
std::enable_if_t<QtPrivate::isInvocable<KeepFunctor, Sequence>::value, int> = 0,
|
||||
typename ResultType = typename QtPrivate::ReduceResultTypeHelper<ReduceFunctor>::type>
|
||||
QFuture<ResultType> filteredReduced(Sequence &&sequence,
|
||||
KeepFunctor &&keep,
|
||||
ReduceFunctor &&reduce,
|
||||
@ -177,9 +177,9 @@ QFuture<ResultType> filteredReduced(Sequence &&sequence,
|
||||
}
|
||||
|
||||
template <typename Sequence, typename KeepFunctor, typename ReduceFunctor,
|
||||
typename ResultType =
|
||||
typename QtPrivate::ReduceResultType<std::decay_t<ReduceFunctor>>::ResultType,
|
||||
typename InitialValueType,
|
||||
std::enable_if_t<QtPrivate::isInvocable<KeepFunctor, Sequence>::value, int> = 0,
|
||||
typename ResultType = typename QtPrivate::ReduceResultTypeHelper<ReduceFunctor>::type,
|
||||
std::enable_if_t<std::is_convertible_v<InitialValueType, ResultType>, int> = 0>
|
||||
QFuture<ResultType> filteredReduced(QThreadPool *pool,
|
||||
Sequence &&sequence,
|
||||
@ -196,9 +196,9 @@ QFuture<ResultType> filteredReduced(QThreadPool *pool,
|
||||
}
|
||||
|
||||
template <typename Sequence, typename KeepFunctor, typename ReduceFunctor,
|
||||
typename ResultType =
|
||||
typename QtPrivate::ReduceResultType<std::decay_t<ReduceFunctor>>::ResultType,
|
||||
typename InitialValueType,
|
||||
std::enable_if_t<QtPrivate::isInvocable<KeepFunctor, Sequence>::value, int> = 0,
|
||||
typename ResultType = typename QtPrivate::ReduceResultTypeHelper<ReduceFunctor>::type,
|
||||
std::enable_if_t<std::is_convertible_v<InitialValueType, ResultType>, int> = 0>
|
||||
QFuture<ResultType> filteredReduced(Sequence &&sequence,
|
||||
KeepFunctor &&keep,
|
||||
@ -287,8 +287,7 @@ QFuture<ResultType> filteredReduced(Iterator begin,
|
||||
|
||||
#ifndef Q_CLANG_QDOC
|
||||
template <typename Iterator, typename KeepFunctor, typename ReduceFunctor,
|
||||
typename ResultType =
|
||||
typename QtPrivate::ReduceResultType<std::decay_t<ReduceFunctor>>::ResultType>
|
||||
typename ResultType = typename QtPrivate::ReduceResultTypeHelper<ReduceFunctor>::type>
|
||||
QFuture<ResultType> filteredReduced(QThreadPool *pool,
|
||||
Iterator begin,
|
||||
Iterator end,
|
||||
@ -302,8 +301,7 @@ QFuture<ResultType> filteredReduced(QThreadPool *pool,
|
||||
}
|
||||
|
||||
template <typename Iterator, typename KeepFunctor, typename ReduceFunctor,
|
||||
typename ResultType =
|
||||
typename QtPrivate::ReduceResultType<std::decay_t<ReduceFunctor>>::ResultType>
|
||||
typename ResultType = typename QtPrivate::ReduceResultTypeHelper<ReduceFunctor>::type>
|
||||
QFuture<ResultType> filteredReduced(Iterator begin,
|
||||
Iterator end,
|
||||
KeepFunctor &&keep,
|
||||
@ -317,8 +315,7 @@ QFuture<ResultType> filteredReduced(Iterator begin,
|
||||
}
|
||||
|
||||
template <typename Iterator, typename KeepFunctor, typename ReduceFunctor,
|
||||
typename ResultType =
|
||||
typename QtPrivate::ReduceResultType<std::decay_t<ReduceFunctor>>::ResultType,
|
||||
typename ResultType = typename QtPrivate::ReduceResultTypeHelper<ReduceFunctor>::type,
|
||||
typename InitialValueType,
|
||||
std::enable_if_t<std::is_convertible_v<InitialValueType, ResultType>, int> = 0>
|
||||
QFuture<ResultType> filteredReduced(QThreadPool *pool,
|
||||
@ -336,8 +333,8 @@ QFuture<ResultType> filteredReduced(QThreadPool *pool,
|
||||
}
|
||||
|
||||
template <typename Iterator, typename KeepFunctor, typename ReduceFunctor,
|
||||
typename ResultType =
|
||||
typename QtPrivate::ReduceResultType<std::decay_t<ReduceFunctor>>::ResultType,
|
||||
std::enable_if_t<QtPrivate::isIterator<Iterator>::value, int> = 0,
|
||||
typename ResultType = typename QtPrivate::ReduceResultTypeHelper<ReduceFunctor>::type,
|
||||
typename InitialValueType,
|
||||
std::enable_if_t<std::is_convertible_v<InitialValueType, ResultType>, int> = 0>
|
||||
QFuture<ResultType> filteredReduced(Iterator begin,
|
||||
@ -480,8 +477,8 @@ ResultType blockingFilteredReduced(Sequence &&sequence,
|
||||
|
||||
#ifndef Q_CLANG_QDOC
|
||||
template <typename Sequence, typename KeepFunctor, typename ReduceFunctor,
|
||||
typename ResultType =
|
||||
typename QtPrivate::ReduceResultType<std::decay_t<ReduceFunctor>>::ResultType>
|
||||
std::enable_if_t<QtPrivate::isInvocable<KeepFunctor, Sequence>::value, int> = 0,
|
||||
typename ResultType = typename QtPrivate::ReduceResultTypeHelper<ReduceFunctor>::type>
|
||||
ResultType blockingFilteredReduced(QThreadPool *pool,
|
||||
Sequence &&sequence,
|
||||
KeepFunctor &&keep,
|
||||
@ -496,8 +493,8 @@ ResultType blockingFilteredReduced(QThreadPool *pool,
|
||||
}
|
||||
|
||||
template <typename Sequence, typename KeepFunctor, typename ReduceFunctor,
|
||||
typename ResultType =
|
||||
typename QtPrivate::ReduceResultType<std::decay_t<ReduceFunctor>>::ResultType>
|
||||
std::enable_if_t<QtPrivate::isInvocable<KeepFunctor, Sequence>::value, int> = 0,
|
||||
typename ResultType = typename QtPrivate::ReduceResultTypeHelper<ReduceFunctor>::type>
|
||||
ResultType blockingFilteredReduced(Sequence &&sequence,
|
||||
KeepFunctor &&keep,
|
||||
ReduceFunctor &&reduce,
|
||||
@ -511,9 +508,9 @@ ResultType blockingFilteredReduced(Sequence &&sequence,
|
||||
}
|
||||
|
||||
template <typename Sequence, typename KeepFunctor, typename ReduceFunctor,
|
||||
typename ResultType =
|
||||
typename QtPrivate::ReduceResultType<std::decay_t<ReduceFunctor>>::ResultType,
|
||||
typename InitialValueType,
|
||||
std::enable_if_t<QtPrivate::isInvocable<KeepFunctor, Sequence>::value, int> = 0,
|
||||
typename ResultType = typename QtPrivate::ReduceResultTypeHelper<ReduceFunctor>::type,
|
||||
std::enable_if_t<std::is_convertible_v<InitialValueType, ResultType>, int> = 0>
|
||||
ResultType blockingFilteredReduced(QThreadPool *pool,
|
||||
Sequence &&sequence,
|
||||
@ -531,9 +528,9 @@ ResultType blockingFilteredReduced(QThreadPool *pool,
|
||||
}
|
||||
|
||||
template <typename Sequence, typename KeepFunctor, typename ReduceFunctor,
|
||||
typename ResultType =
|
||||
typename QtPrivate::ReduceResultType<std::decay_t<ReduceFunctor>>::ResultType,
|
||||
typename InitialValueType,
|
||||
std::enable_if_t<QtPrivate::isInvocable<KeepFunctor, Sequence>::value, int> = 0,
|
||||
typename ResultType = typename QtPrivate::ReduceResultTypeHelper<ReduceFunctor>::type,
|
||||
std::enable_if_t<std::is_convertible_v<InitialValueType, ResultType>, int> = 0>
|
||||
ResultType blockingFilteredReduced(Sequence &&sequence,
|
||||
KeepFunctor &&keep,
|
||||
@ -627,8 +624,7 @@ ResultType blockingFilteredReduced(Iterator begin,
|
||||
|
||||
#ifndef Q_CLANG_QDOC
|
||||
template <typename Iterator, typename KeepFunctor, typename ReduceFunctor,
|
||||
typename ResultType =
|
||||
typename QtPrivate::ReduceResultType<std::decay_t<ReduceFunctor>>::ResultType>
|
||||
typename ResultType = typename QtPrivate::ReduceResultTypeHelper<ReduceFunctor>::type>
|
||||
ResultType blockingFilteredReduced(QThreadPool *pool,
|
||||
Iterator begin,
|
||||
Iterator end,
|
||||
@ -644,8 +640,7 @@ ResultType blockingFilteredReduced(QThreadPool *pool,
|
||||
}
|
||||
|
||||
template <typename Iterator, typename KeepFunctor, typename ReduceFunctor,
|
||||
typename ResultType =
|
||||
typename QtPrivate::ReduceResultType<std::decay_t<ReduceFunctor>>::ResultType>
|
||||
typename ResultType = typename QtPrivate::ReduceResultTypeHelper<ReduceFunctor>::type>
|
||||
ResultType blockingFilteredReduced(Iterator begin,
|
||||
Iterator end,
|
||||
KeepFunctor &&keep,
|
||||
@ -660,8 +655,7 @@ ResultType blockingFilteredReduced(Iterator begin,
|
||||
}
|
||||
|
||||
template <typename Iterator, typename KeepFunctor, typename ReduceFunctor,
|
||||
typename ResultType =
|
||||
typename QtPrivate::ReduceResultType<std::decay_t<ReduceFunctor>>::ResultType,
|
||||
typename ResultType = typename QtPrivate::ReduceResultTypeHelper<ReduceFunctor>::type,
|
||||
typename InitialValueType,
|
||||
std::enable_if_t<std::is_convertible_v<InitialValueType, ResultType>, int> = 0>
|
||||
ResultType blockingFilteredReduced(QThreadPool *pool,
|
||||
@ -679,8 +673,8 @@ ResultType blockingFilteredReduced(QThreadPool *pool,
|
||||
}
|
||||
|
||||
template <typename Iterator, typename KeepFunctor, typename ReduceFunctor,
|
||||
typename ResultType =
|
||||
typename QtPrivate::ReduceResultType<std::decay_t<ReduceFunctor>>::ResultType,
|
||||
std::enable_if_t<QtPrivate::isIterator<Iterator>::value, int> = 0,
|
||||
typename ResultType = typename QtPrivate::ReduceResultTypeHelper<ReduceFunctor>::type,
|
||||
typename InitialValueType,
|
||||
std::enable_if_t<std::is_convertible_v<InitialValueType, ResultType>, int> = 0>
|
||||
ResultType blockingFilteredReduced(Iterator begin,
|
||||
|
||||
@ -41,6 +41,7 @@
|
||||
#define QTCONCURRENT_FUNCTIONWRAPPERS_H
|
||||
|
||||
#include <QtConcurrent/qtconcurrentcompilertest.h>
|
||||
#include <QtCore/qfuture.h>
|
||||
#include <QtCore/QStringList>
|
||||
|
||||
#include <tuple>
|
||||
@ -143,6 +144,50 @@ struct ReduceResultType<T(C::*)(U) noexcept>
|
||||
};
|
||||
#endif
|
||||
|
||||
template<class T, class Enable = void>
|
||||
struct hasCallOperator : std::false_type
|
||||
{
|
||||
};
|
||||
|
||||
template<class T>
|
||||
struct hasCallOperator<T, std::void_t<decltype(&T::operator())>> : std::true_type
|
||||
{
|
||||
};
|
||||
|
||||
template<class T, class Enable = void>
|
||||
struct isIterator : std::false_type
|
||||
{
|
||||
};
|
||||
|
||||
template<class T>
|
||||
struct isIterator<T, std::void_t<typename std::iterator_traits<T>::value_type>> : std::true_type
|
||||
{
|
||||
};
|
||||
|
||||
template <class Callable, class Sequence>
|
||||
using isInvocable = std::is_invocable<Callable, typename std::decay_t<Sequence>::value_type>;
|
||||
|
||||
template<class Callable, class Enable = void>
|
||||
struct ReduceResultTypeHelper
|
||||
{
|
||||
};
|
||||
|
||||
template <class Callable>
|
||||
struct ReduceResultTypeHelper<Callable,
|
||||
typename std::enable_if_t<std::is_function_v<std::remove_pointer_t<std::decay_t<Callable>>>
|
||||
|| std::is_member_function_pointer_v<std::decay_t<Callable>>>>
|
||||
{
|
||||
using type = typename QtPrivate::ReduceResultType<std::decay_t<Callable>>::ResultType;
|
||||
};
|
||||
|
||||
template <class Callable>
|
||||
struct ReduceResultTypeHelper<Callable,
|
||||
typename std::enable_if_t<!std::is_function_v<std::remove_pointer_t<std::decay_t<Callable>>>
|
||||
&& hasCallOperator<std::decay_t<Callable>>::value>>
|
||||
{
|
||||
using type = std::decay_t<typename QtPrivate::ArgResolver<Callable>::First>;
|
||||
};
|
||||
|
||||
// -- MapSequenceResultType
|
||||
|
||||
template <class InputSequence, class MapFunctor>
|
||||
|
||||
@ -151,8 +151,8 @@ QFuture<ResultType> mappedReduced(Sequence &&sequence,
|
||||
}
|
||||
|
||||
template <typename Sequence, typename MapFunctor, typename ReduceFunctor,
|
||||
typename ResultType =
|
||||
typename QtPrivate::ReduceResultType<std::decay_t<ReduceFunctor>>::ResultType>
|
||||
std::enable_if_t<QtPrivate::isInvocable<MapFunctor, Sequence>::value, int> = 0,
|
||||
typename ResultType = typename QtPrivate::ReduceResultTypeHelper<ReduceFunctor>::type>
|
||||
QFuture<ResultType> mappedReduced(QThreadPool *pool,
|
||||
Sequence &&sequence,
|
||||
MapFunctor &&map,
|
||||
@ -166,8 +166,8 @@ QFuture<ResultType> mappedReduced(QThreadPool *pool,
|
||||
}
|
||||
|
||||
template <typename Sequence, typename MapFunctor, typename ReduceFunctor,
|
||||
typename ResultType =
|
||||
typename QtPrivate::ReduceResultType<std::decay_t<ReduceFunctor>>::ResultType>
|
||||
std::enable_if_t<QtPrivate::isInvocable<MapFunctor, Sequence>::value, int> = 0,
|
||||
typename ResultType = typename QtPrivate::ReduceResultTypeHelper<ReduceFunctor>::type>
|
||||
QFuture<ResultType> mappedReduced(Sequence &&sequence,
|
||||
MapFunctor &&map,
|
||||
ReduceFunctor &&reduce,
|
||||
@ -183,10 +183,9 @@ QFuture<ResultType> mappedReduced(Sequence &&sequence,
|
||||
template <typename Sequence, typename MapFunctor, typename ReduceFunctor, typename ResultType,
|
||||
typename InitialValueType>
|
||||
#else
|
||||
template <typename Sequence, typename MapFunctor, typename ReduceFunctor,
|
||||
typename ResultType =
|
||||
typename QtPrivate::ReduceResultType<std::decay_t<ReduceFunctor>>::ResultType,
|
||||
typename InitialValueType,
|
||||
template <typename Sequence, typename MapFunctor, typename ReduceFunctor, typename InitialValueType,
|
||||
std::enable_if_t<QtPrivate::isInvocable<MapFunctor, Sequence>::value, int> = 0,
|
||||
typename ResultType = typename QtPrivate::ReduceResultTypeHelper<ReduceFunctor>::type,
|
||||
std::enable_if_t<std::is_convertible_v<InitialValueType, ResultType>, int> = 0>
|
||||
#endif
|
||||
QFuture<ResultType> mappedReduced(QThreadPool *pool,
|
||||
@ -207,10 +206,9 @@ QFuture<ResultType> mappedReduced(QThreadPool *pool,
|
||||
template <typename Sequence, typename MapFunctor, typename ReduceFunctor, typename ResultType,
|
||||
typename InitialValueType>
|
||||
#else
|
||||
template <typename Sequence, typename MapFunctor, typename ReduceFunctor,
|
||||
typename ResultType =
|
||||
typename QtPrivate::ReduceResultType<std::decay_t<ReduceFunctor>>::ResultType,
|
||||
typename InitialValueType,
|
||||
template <typename Sequence, typename MapFunctor, typename ReduceFunctor, typename InitialValueType,
|
||||
std::enable_if_t<QtPrivate::isInvocable<MapFunctor, Sequence>::value, int> = 0,
|
||||
typename ResultType = typename QtPrivate::ReduceResultTypeHelper<ReduceFunctor>::type,
|
||||
std::enable_if_t<std::is_convertible_v<InitialValueType, ResultType>, int> = 0>
|
||||
#endif
|
||||
QFuture<ResultType> mappedReduced(Sequence &&sequence,
|
||||
@ -299,8 +297,7 @@ QFuture<ResultType> mappedReduced(Iterator begin,
|
||||
}
|
||||
|
||||
template <typename Iterator, typename MapFunctor, typename ReduceFunctor,
|
||||
typename ResultType =
|
||||
typename QtPrivate::ReduceResultType<std::decay_t<ReduceFunctor>>::ResultType>
|
||||
typename ResultType = typename QtPrivate::ReduceResultTypeHelper<ReduceFunctor>::type>
|
||||
QFuture<ResultType> mappedReduced(QThreadPool *pool,
|
||||
Iterator begin,
|
||||
Iterator end,
|
||||
@ -315,7 +312,7 @@ QFuture<ResultType> mappedReduced(QThreadPool *pool,
|
||||
}
|
||||
|
||||
template <typename Iterator, typename MapFunctor, typename ReduceFunctor,
|
||||
typename ResultType = typename QtPrivate::ReduceResultType<std::decay_t<ReduceFunctor>>::ResultType>
|
||||
typename ResultType = typename QtPrivate::ReduceResultTypeHelper<ReduceFunctor>::type>
|
||||
QFuture<ResultType> mappedReduced(Iterator begin,
|
||||
Iterator end,
|
||||
MapFunctor &&map,
|
||||
@ -333,8 +330,7 @@ template <typename Iterator, typename MapFunctor, typename ReduceFunctor, typena
|
||||
typename InitialValueType>
|
||||
#else
|
||||
template <typename Iterator, typename MapFunctor, typename ReduceFunctor,
|
||||
typename ResultType =
|
||||
typename QtPrivate::ReduceResultType<std::decay_t<ReduceFunctor>>::ResultType,
|
||||
typename ResultType = typename QtPrivate::ReduceResultTypeHelper<ReduceFunctor>::type,
|
||||
typename InitialValueType,
|
||||
std::enable_if_t<std::is_convertible_v<InitialValueType, ResultType>, int> = 0>
|
||||
#endif
|
||||
@ -357,8 +353,8 @@ template <typename Iterator, typename MapFunctor, typename ReduceFunctor, typena
|
||||
typename InitialValueType>
|
||||
#else
|
||||
template<typename Iterator, typename MapFunctor, typename ReduceFunctor,
|
||||
typename ResultType =
|
||||
typename QtPrivate::ReduceResultType<std::decay_t<ReduceFunctor>>::ResultType,
|
||||
std::enable_if_t<QtPrivate::isIterator<Iterator>::value, int> = 0,
|
||||
typename ResultType = typename QtPrivate::ReduceResultTypeHelper<ReduceFunctor>::type,
|
||||
typename InitialValueType,
|
||||
std::enable_if_t<std::is_convertible_v<InitialValueType, ResultType>, int> = 0>
|
||||
#endif
|
||||
@ -528,8 +524,8 @@ ResultType blockingMappedReduced(Sequence &&sequence,
|
||||
}
|
||||
|
||||
template <typename MapFunctor, typename ReduceFunctor, typename Sequence,
|
||||
typename ResultType =
|
||||
typename QtPrivate::ReduceResultType<std::decay_t<ReduceFunctor>>::ResultType>
|
||||
std::enable_if_t<QtPrivate::isInvocable<MapFunctor, Sequence>::value, int> = 0,
|
||||
typename ResultType = typename QtPrivate::ReduceResultTypeHelper<ReduceFunctor>::type>
|
||||
ResultType blockingMappedReduced(QThreadPool *pool,
|
||||
Sequence &&sequence,
|
||||
MapFunctor &&map,
|
||||
@ -545,8 +541,8 @@ ResultType blockingMappedReduced(QThreadPool *pool,
|
||||
}
|
||||
|
||||
template <typename MapFunctor, typename ReduceFunctor, typename Sequence,
|
||||
typename ResultType =
|
||||
typename QtPrivate::ReduceResultType<std::decay_t<ReduceFunctor>>::ResultType>
|
||||
std::enable_if_t<QtPrivate::isInvocable<MapFunctor, Sequence>::value, int> = 0,
|
||||
typename ResultType = typename QtPrivate::ReduceResultTypeHelper<ReduceFunctor>::type>
|
||||
ResultType blockingMappedReduced(Sequence &&sequence,
|
||||
MapFunctor &&map,
|
||||
ReduceFunctor &&reduce,
|
||||
@ -564,10 +560,9 @@ ResultType blockingMappedReduced(Sequence &&sequence,
|
||||
template <typename MapFunctor, typename ReduceFunctor, typename Sequence, typename ResultType,
|
||||
typename InitialValueType>
|
||||
#else
|
||||
template <typename MapFunctor, typename ReduceFunctor, typename Sequence,
|
||||
typename ResultType =
|
||||
typename QtPrivate::ReduceResultType<std::decay_t<ReduceFunctor>>::ResultType,
|
||||
typename InitialValueType,
|
||||
template <typename MapFunctor, typename ReduceFunctor, typename Sequence, typename InitialValueType,
|
||||
std::enable_if_t<QtPrivate::isInvocable<MapFunctor, Sequence>::value, int> = 0,
|
||||
typename ResultType = typename QtPrivate::ReduceResultTypeHelper<ReduceFunctor>::type,
|
||||
std::enable_if_t<std::is_convertible_v<InitialValueType, ResultType>, int> = 0>
|
||||
#endif
|
||||
ResultType blockingMappedReduced(QThreadPool *pool,
|
||||
@ -589,10 +584,9 @@ ResultType blockingMappedReduced(QThreadPool *pool,
|
||||
template <typename MapFunctor, typename ReduceFunctor, typename Sequence, typename ResultType,
|
||||
typename InitialValueType>
|
||||
#else
|
||||
template<typename MapFunctor, typename ReduceFunctor, typename Sequence,
|
||||
typename ResultType =
|
||||
typename QtPrivate::ReduceResultType<std::decay_t<ReduceFunctor>>::ResultType,
|
||||
typename InitialValueType,
|
||||
template<typename MapFunctor, typename ReduceFunctor, typename Sequence, typename InitialValueType,
|
||||
std::enable_if_t<QtPrivate::isInvocable<MapFunctor, Sequence>::value, int> = 0,
|
||||
typename ResultType = typename QtPrivate::ReduceResultTypeHelper<ReduceFunctor>::type,
|
||||
std::enable_if_t<std::is_convertible_v<InitialValueType, ResultType>, int> = 0>
|
||||
#endif
|
||||
ResultType blockingMappedReduced(Sequence &&sequence,
|
||||
@ -687,8 +681,7 @@ ResultType blockingMappedReduced(Iterator begin,
|
||||
}
|
||||
|
||||
template <typename Iterator, typename MapFunctor, typename ReduceFunctor,
|
||||
typename ResultType =
|
||||
typename QtPrivate::ReduceResultType<std::decay_t<ReduceFunctor>>::ResultType>
|
||||
typename ResultType = typename QtPrivate::ReduceResultTypeHelper<ReduceFunctor>::type>
|
||||
ResultType blockingMappedReduced(QThreadPool *pool,
|
||||
Iterator begin,
|
||||
Iterator end,
|
||||
@ -704,8 +697,7 @@ ResultType blockingMappedReduced(QThreadPool *pool,
|
||||
}
|
||||
|
||||
template <typename Iterator, typename MapFunctor, typename ReduceFunctor,
|
||||
typename ResultType =
|
||||
typename QtPrivate::ReduceResultType<std::decay_t<ReduceFunctor>>::ResultType>
|
||||
typename ResultType = typename QtPrivate::ReduceResultTypeHelper<ReduceFunctor>::type>
|
||||
ResultType blockingMappedReduced(Iterator begin,
|
||||
Iterator end,
|
||||
MapFunctor &&map,
|
||||
@ -724,8 +716,7 @@ template <typename Iterator, typename MapFunctor, typename ReduceFunctor, typena
|
||||
typename InitialValueType>
|
||||
#else
|
||||
template <typename Iterator, typename MapFunctor, typename ReduceFunctor,
|
||||
typename ResultType =
|
||||
typename QtPrivate::ReduceResultType<std::decay_t<ReduceFunctor>>::ResultType,
|
||||
typename ResultType = typename QtPrivate::ReduceResultTypeHelper<ReduceFunctor>::type,
|
||||
typename InitialValueType,
|
||||
std::enable_if_t<std::is_convertible_v<InitialValueType, ResultType>, int> = 0>
|
||||
#endif
|
||||
@ -749,8 +740,8 @@ template <typename Iterator, typename MapFunctor, typename ReduceFunctor, typena
|
||||
typename InitialValueType>
|
||||
#else
|
||||
template <typename Iterator, typename MapFunctor, typename ReduceFunctor,
|
||||
typename ResultType =
|
||||
typename QtPrivate::ReduceResultType<std::decay_t<ReduceFunctor>>::ResultType,
|
||||
std::enable_if_t<QtPrivate::isIterator<Iterator>::value, int> = 0,
|
||||
typename ResultType = typename QtPrivate::ReduceResultTypeHelper<ReduceFunctor>::type,
|
||||
typename InitialValueType,
|
||||
std::enable_if_t<std::is_convertible_v<InitialValueType, ResultType>, int> = 0>
|
||||
#endif
|
||||
|
||||
@ -409,6 +409,8 @@ void testFilteredReduced(const QList<SourceObject> &sourceObjectList,
|
||||
const ResultObject &expectedResult,
|
||||
FilterObject filterObject,
|
||||
ReduceObject reduceObject)
|
||||
{
|
||||
// Result type is passed explicitly
|
||||
{
|
||||
const ResultObject result1 = QtConcurrent::filteredReduced<ResultObject>(
|
||||
sourceObjectList, filterObject, reduceObject).result();
|
||||
@ -429,6 +431,28 @@ void testFilteredReduced(const QList<SourceObject> &sourceObjectList,
|
||||
QCOMPARE(result4, expectedResult);
|
||||
}
|
||||
|
||||
// Result type is deduced
|
||||
{
|
||||
const ResultObject result1 = QtConcurrent::filteredReduced(
|
||||
sourceObjectList, filterObject, reduceObject).result();
|
||||
QCOMPARE(result1, expectedResult);
|
||||
|
||||
const ResultObject result2 = QtConcurrent::filteredReduced(
|
||||
sourceObjectList.constBegin(), sourceObjectList.constEnd(),
|
||||
filterObject, reduceObject).result();
|
||||
QCOMPARE(result2, expectedResult);
|
||||
|
||||
const ResultObject result3 = QtConcurrent::blockingFilteredReduced(
|
||||
sourceObjectList, filterObject, reduceObject);
|
||||
QCOMPARE(result3, expectedResult);
|
||||
|
||||
const ResultObject result4 = QtConcurrent::blockingFilteredReduced(
|
||||
sourceObjectList.constBegin(), sourceObjectList.constEnd(),
|
||||
filterObject, reduceObject);
|
||||
QCOMPARE(result4, expectedResult);
|
||||
}
|
||||
}
|
||||
|
||||
template <typename SourceObject,
|
||||
typename ResultObject,
|
||||
typename FilterObject,
|
||||
@ -569,6 +593,8 @@ void testFilteredReducedThreadPool(QThreadPool *pool,
|
||||
const ResultObject &expectedResult,
|
||||
FilterObject filterObject,
|
||||
ReduceObject reduceObject)
|
||||
{
|
||||
// Result type is passed explicitly
|
||||
{
|
||||
const ResultObject result1 = QtConcurrent::filteredReduced<ResultObject>(
|
||||
pool, sourceObjectList, filterObject, reduceObject).result();
|
||||
@ -594,6 +620,33 @@ void testFilteredReducedThreadPool(QThreadPool *pool,
|
||||
QCOMPARE(threadCount(), 1); // ensure the only one thread was working
|
||||
}
|
||||
|
||||
// Result type is deduced
|
||||
{
|
||||
const ResultObject result1 = QtConcurrent::filteredReduced(
|
||||
pool, sourceObjectList, filterObject, reduceObject).result();
|
||||
QCOMPARE(result1, expectedResult);
|
||||
QCOMPARE(threadCount(), 1); // ensure the only one thread was working
|
||||
|
||||
const ResultObject result2 =
|
||||
QtConcurrent::filteredReduced(pool, sourceObjectList.constBegin(),
|
||||
sourceObjectList.constEnd(), filterObject,
|
||||
reduceObject).result();
|
||||
QCOMPARE(result2, expectedResult);
|
||||
QCOMPARE(threadCount(), 1); // ensure the only one thread was working
|
||||
|
||||
const ResultObject result3 = QtConcurrent::blockingFilteredReduced(
|
||||
pool, sourceObjectList, filterObject, reduceObject);
|
||||
QCOMPARE(result3, expectedResult);
|
||||
QCOMPARE(threadCount(), 1); // ensure the only one thread was working
|
||||
|
||||
const ResultObject result4 = QtConcurrent::blockingFilteredReduced(
|
||||
pool, sourceObjectList.constBegin(), sourceObjectList.constEnd(),
|
||||
filterObject, reduceObject);
|
||||
QCOMPARE(result4, expectedResult);
|
||||
QCOMPARE(threadCount(), 1); // ensure the only one thread was working
|
||||
}
|
||||
}
|
||||
|
||||
void tst_QtConcurrentFilter::filteredReducedThreadPool()
|
||||
{
|
||||
const QList<int> intList {1, 2, 3, 4};
|
||||
@ -666,24 +719,24 @@ void tst_QtConcurrentFilter::filteredReducedWithMoveOnlyCallables()
|
||||
const auto sum = 6;
|
||||
{
|
||||
const auto result =
|
||||
QtConcurrent::filteredReduced<int>(intList, KeepEvenIntegersMoveOnly(),
|
||||
QtConcurrent::filteredReduced(intList, KeepEvenIntegersMoveOnly(),
|
||||
IntSumReduceMoveOnly()).result();
|
||||
QCOMPARE(result, sum);
|
||||
}
|
||||
{
|
||||
const auto result =
|
||||
QtConcurrent::filteredReduced<int>(intList.begin(), intList.end(),
|
||||
QtConcurrent::filteredReduced(intList.begin(), intList.end(),
|
||||
KeepEvenIntegersMoveOnly(),
|
||||
IntSumReduceMoveOnly()).result();
|
||||
QCOMPARE(result, sum);
|
||||
}
|
||||
{
|
||||
const auto result = QtConcurrent::blockingFilteredReduced<int>(
|
||||
const auto result = QtConcurrent::blockingFilteredReduced(
|
||||
intList, KeepEvenIntegersMoveOnly(), IntSumReduceMoveOnly());
|
||||
QCOMPARE(result, sum);
|
||||
}
|
||||
{
|
||||
const auto result = QtConcurrent::blockingFilteredReduced<int>(
|
||||
const auto result = QtConcurrent::blockingFilteredReduced(
|
||||
intList.begin(), intList.end(), KeepEvenIntegersMoveOnly(), IntSumReduceMoveOnly());
|
||||
QCOMPARE(result, sum);
|
||||
}
|
||||
@ -691,23 +744,23 @@ void tst_QtConcurrentFilter::filteredReducedWithMoveOnlyCallables()
|
||||
QThreadPool pool;
|
||||
{
|
||||
const auto result =
|
||||
QtConcurrent::filteredReduced<int>(&pool, intList, KeepEvenIntegersMoveOnly(),
|
||||
QtConcurrent::filteredReduced(&pool, intList, KeepEvenIntegersMoveOnly(),
|
||||
IntSumReduceMoveOnly()).result();
|
||||
QCOMPARE(result, sum);
|
||||
}
|
||||
{
|
||||
const auto result = QtConcurrent::filteredReduced<int>(
|
||||
const auto result = QtConcurrent::filteredReduced(
|
||||
&pool, intList.begin(), intList.end(),
|
||||
KeepEvenIntegersMoveOnly(), IntSumReduceMoveOnly()).result();
|
||||
QCOMPARE(result, sum);
|
||||
}
|
||||
{
|
||||
const auto result = QtConcurrent::blockingFilteredReduced<int>(
|
||||
const auto result = QtConcurrent::blockingFilteredReduced(
|
||||
&pool, intList, KeepEvenIntegersMoveOnly(), IntSumReduceMoveOnly());
|
||||
QCOMPARE(result, sum);
|
||||
}
|
||||
{
|
||||
const auto result = QtConcurrent::blockingFilteredReduced<int>(
|
||||
const auto result = QtConcurrent::blockingFilteredReduced(
|
||||
&pool, intList.begin(), intList.end(), KeepEvenIntegersMoveOnly(),
|
||||
IntSumReduceMoveOnly());
|
||||
QCOMPARE(result, sum);
|
||||
@ -773,6 +826,8 @@ void testFilteredReducedInitialValue(const QList<SourceObject> &sourceObjectList
|
||||
FilterObject filterObject,
|
||||
ReduceObject reduceObject,
|
||||
InitialObject &&initialObject)
|
||||
{
|
||||
// Result type is passed explicitly
|
||||
{
|
||||
const ResultObject result1 = QtConcurrent::filteredReduced<ResultObject>(
|
||||
sourceObjectList, filterObject, reduceObject, initialObject).result();
|
||||
@ -793,6 +848,28 @@ void testFilteredReducedInitialValue(const QList<SourceObject> &sourceObjectList
|
||||
QCOMPARE(result4, expectedResult);
|
||||
}
|
||||
|
||||
// Result type is deduced
|
||||
{
|
||||
const ResultObject result1 = QtConcurrent::filteredReduced(
|
||||
sourceObjectList, filterObject, reduceObject, initialObject).result();
|
||||
QCOMPARE(result1, expectedResult);
|
||||
|
||||
const ResultObject result2 = QtConcurrent::filteredReduced(
|
||||
sourceObjectList.constBegin(), sourceObjectList.constEnd(),
|
||||
filterObject, reduceObject, initialObject).result();
|
||||
QCOMPARE(result2, expectedResult);
|
||||
|
||||
const ResultObject result3 = QtConcurrent::blockingFilteredReduced(
|
||||
sourceObjectList, filterObject, reduceObject, initialObject);
|
||||
QCOMPARE(result3, expectedResult);
|
||||
|
||||
const ResultObject result4 = QtConcurrent::blockingFilteredReduced(
|
||||
sourceObjectList.constBegin(), sourceObjectList.constEnd(),
|
||||
filterObject, reduceObject, initialObject);
|
||||
QCOMPARE(result4, expectedResult);
|
||||
}
|
||||
}
|
||||
|
||||
template <typename SourceObject,
|
||||
typename ResultObject,
|
||||
typename InitialObject,
|
||||
@ -944,6 +1021,8 @@ void testFilteredReducedInitialValueThreadPool(QThreadPool *pool,
|
||||
FilterObject filterObject,
|
||||
ReduceObject reduceObject,
|
||||
InitialObject &&initialObject)
|
||||
{
|
||||
// Result type is passed explicitly
|
||||
{
|
||||
const ResultObject result1 = QtConcurrent::filteredReduced<ResultObject>(
|
||||
pool, sourceObjectList, filterObject, reduceObject, initialObject).result();
|
||||
@ -969,6 +1048,33 @@ void testFilteredReducedInitialValueThreadPool(QThreadPool *pool,
|
||||
QCOMPARE(threadCount(), 1); // ensure the only one thread was working
|
||||
}
|
||||
|
||||
// Result type is deduced
|
||||
{
|
||||
const ResultObject result1 = QtConcurrent::filteredReduced(
|
||||
pool, sourceObjectList, filterObject, reduceObject, initialObject).result();
|
||||
QCOMPARE(result1, expectedResult);
|
||||
QCOMPARE(threadCount(), 1); // ensure the only one thread was working
|
||||
|
||||
const ResultObject result2 =
|
||||
QtConcurrent::filteredReduced(pool, sourceObjectList.constBegin(),
|
||||
sourceObjectList.constEnd(), filterObject,
|
||||
reduceObject, initialObject).result();
|
||||
QCOMPARE(result2, expectedResult);
|
||||
QCOMPARE(threadCount(), 1); // ensure the only one thread was working
|
||||
|
||||
const ResultObject result3 = QtConcurrent::blockingFilteredReduced(
|
||||
pool, sourceObjectList, filterObject, reduceObject, initialObject);
|
||||
QCOMPARE(result3, expectedResult);
|
||||
QCOMPARE(threadCount(), 1); // ensure the only one thread was working
|
||||
|
||||
const ResultObject result4 = QtConcurrent::blockingFilteredReduced(
|
||||
pool, sourceObjectList.constBegin(), sourceObjectList.constEnd(),
|
||||
filterObject, reduceObject, initialObject);
|
||||
QCOMPARE(result4, expectedResult);
|
||||
QCOMPARE(threadCount(), 1); // ensure the only one thread was working
|
||||
}
|
||||
}
|
||||
|
||||
void tst_QtConcurrentFilter::filteredReducedInitialValueThreadPool()
|
||||
{
|
||||
const QList<int> intList {1, 2, 3, 4};
|
||||
@ -1053,24 +1159,24 @@ void tst_QtConcurrentFilter::filteredReducedInitialValueWithMoveOnlyCallables()
|
||||
const auto sum = 16;
|
||||
{
|
||||
const auto result =
|
||||
QtConcurrent::filteredReduced<int>(intList, KeepEvenIntegersMoveOnly(),
|
||||
QtConcurrent::filteredReduced(intList, KeepEvenIntegersMoveOnly(),
|
||||
IntSumReduceMoveOnly(), initial).result();
|
||||
QCOMPARE(result, sum);
|
||||
}
|
||||
{
|
||||
const auto result =
|
||||
QtConcurrent::filteredReduced<int>(intList.begin(), intList.end(),
|
||||
QtConcurrent::filteredReduced(intList.begin(), intList.end(),
|
||||
KeepEvenIntegersMoveOnly(),
|
||||
IntSumReduceMoveOnly(), initial).result();
|
||||
QCOMPARE(result, sum);
|
||||
}
|
||||
{
|
||||
const auto result = QtConcurrent::blockingFilteredReduced<int>(
|
||||
const auto result = QtConcurrent::blockingFilteredReduced(
|
||||
intList, KeepEvenIntegersMoveOnly(), IntSumReduceMoveOnly(), initial);
|
||||
QCOMPARE(result, sum);
|
||||
}
|
||||
{
|
||||
const auto result = QtConcurrent::blockingFilteredReduced<int>(
|
||||
const auto result = QtConcurrent::blockingFilteredReduced(
|
||||
intList.begin(), intList.end(), KeepEvenIntegersMoveOnly(), IntSumReduceMoveOnly(),
|
||||
initial);
|
||||
QCOMPARE(result, sum);
|
||||
@ -1079,24 +1185,24 @@ void tst_QtConcurrentFilter::filteredReducedInitialValueWithMoveOnlyCallables()
|
||||
QThreadPool pool;
|
||||
{
|
||||
const auto result =
|
||||
QtConcurrent::filteredReduced<int>(&pool, intList, KeepEvenIntegersMoveOnly(),
|
||||
QtConcurrent::filteredReduced(&pool, intList, KeepEvenIntegersMoveOnly(),
|
||||
IntSumReduceMoveOnly(), initial).result();
|
||||
QCOMPARE(result, sum);
|
||||
}
|
||||
{
|
||||
const auto result =
|
||||
QtConcurrent::filteredReduced<int>(
|
||||
QtConcurrent::filteredReduced(
|
||||
&pool, intList.begin(), intList.end(),
|
||||
KeepEvenIntegersMoveOnly(), IntSumReduceMoveOnly(), initial).result();
|
||||
QCOMPARE(result, sum);
|
||||
}
|
||||
{
|
||||
const auto result = QtConcurrent::blockingFilteredReduced<int>(
|
||||
const auto result = QtConcurrent::blockingFilteredReduced(
|
||||
&pool, intList, KeepEvenIntegersMoveOnly(), IntSumReduceMoveOnly(), initial);
|
||||
QCOMPARE(result, sum);
|
||||
}
|
||||
{
|
||||
const auto result = QtConcurrent::blockingFilteredReduced<int>(
|
||||
const auto result = QtConcurrent::blockingFilteredReduced(
|
||||
&pool, intList.begin(), intList.end(), KeepEvenIntegersMoveOnly(),
|
||||
IntSumReduceMoveOnly(), initial);
|
||||
QCOMPARE(result, sum);
|
||||
|
||||
@ -760,6 +760,8 @@ public:
|
||||
|
||||
template <typename SourceObject, typename ResultObject, typename MapObject, typename ReduceObject>
|
||||
void testMappedReduced(const QList<SourceObject> &sourceObjectList, const ResultObject &expectedResult, MapObject mapObject, ReduceObject reduceObject)
|
||||
{
|
||||
// Result type is passed explicitly
|
||||
{
|
||||
const ResultObject result1 = QtConcurrent::mappedReduced<ResultObject>(
|
||||
sourceObjectList, mapObject, reduceObject).result();
|
||||
@ -779,6 +781,27 @@ void testMappedReduced(const QList<SourceObject> &sourceObjectList, const Result
|
||||
QCOMPARE(result4, expectedResult);
|
||||
}
|
||||
|
||||
// Result type is deduced
|
||||
{
|
||||
const ResultObject result1 = QtConcurrent::mappedReduced(
|
||||
sourceObjectList, mapObject, reduceObject).result();
|
||||
QCOMPARE(result1, expectedResult);
|
||||
|
||||
const ResultObject result2 = QtConcurrent::mappedReduced(
|
||||
sourceObjectList.constBegin(), sourceObjectList.constEnd(),
|
||||
mapObject, reduceObject).result();
|
||||
QCOMPARE(result2, expectedResult);
|
||||
|
||||
const ResultObject result3 = QtConcurrent::blockingMappedReduced(
|
||||
sourceObjectList, mapObject, reduceObject);
|
||||
QCOMPARE(result3, expectedResult);
|
||||
|
||||
const ResultObject result4 = QtConcurrent::blockingMappedReduced(
|
||||
sourceObjectList.constBegin(), sourceObjectList.constEnd(), mapObject, reduceObject);
|
||||
QCOMPARE(result4, expectedResult);
|
||||
}
|
||||
}
|
||||
|
||||
template <typename SourceObject, typename ResultObject, typename MapObject, typename ReduceObject>
|
||||
void testMappedReduced(const QList<SourceObject> &sourceObjectList, const ResultObject &expectedResult, MapObject mapObject, ReduceObject reduceObject, QtConcurrent::ReduceOptions options)
|
||||
{
|
||||
@ -885,6 +908,8 @@ void testMappedReducedThreadPool(QThreadPool *pool,
|
||||
const ResultObject &expectedResult,
|
||||
MapObject mapObject,
|
||||
ReduceObject reduceObject)
|
||||
{
|
||||
// Result type is passed explicitly
|
||||
{
|
||||
const ResultObject result1 = QtConcurrent::mappedReduced<ResultObject>(
|
||||
pool, sourceObjectList, mapObject, reduceObject).result();
|
||||
@ -898,17 +923,45 @@ void testMappedReducedThreadPool(QThreadPool *pool,
|
||||
QCOMPARE(result2, expectedResult);
|
||||
QCOMPARE(threadCount(), 1); // ensure the only one thread was working
|
||||
|
||||
const ResultObject result3 = QtConcurrent::blockingMappedReduced<ResultObject>(pool,
|
||||
sourceObjectList, mapObject, reduceObject);
|
||||
const ResultObject result3 = QtConcurrent::blockingMappedReduced<ResultObject>(
|
||||
pool, sourceObjectList, mapObject, reduceObject);
|
||||
QCOMPARE(result3, expectedResult);
|
||||
QCOMPARE(threadCount(), 1); // ensure the only one thread was working
|
||||
|
||||
const ResultObject result4 = QtConcurrent::blockingMappedReduced<ResultObject>(pool,
|
||||
sourceObjectList.constBegin(), sourceObjectList.constEnd(), mapObject, reduceObject);
|
||||
const ResultObject result4 = QtConcurrent::blockingMappedReduced<ResultObject>(
|
||||
pool, sourceObjectList.constBegin(), sourceObjectList.constEnd(),
|
||||
mapObject, reduceObject);
|
||||
QCOMPARE(result4, expectedResult);
|
||||
QCOMPARE(threadCount(), 1); // ensure the only one thread was working
|
||||
}
|
||||
|
||||
// Result type is deduced
|
||||
{
|
||||
const ResultObject result1 = QtConcurrent::mappedReduced(
|
||||
pool, sourceObjectList, mapObject, reduceObject).result();
|
||||
QCOMPARE(result1, expectedResult);
|
||||
QCOMPARE(threadCount(), 1); // ensure the only one thread was working
|
||||
|
||||
const ResultObject result2 =
|
||||
QtConcurrent::mappedReduced(pool, sourceObjectList.constBegin(),
|
||||
sourceObjectList.constEnd(), mapObject,
|
||||
reduceObject).result();
|
||||
QCOMPARE(result2, expectedResult);
|
||||
QCOMPARE(threadCount(), 1); // ensure the only one thread was working
|
||||
|
||||
const ResultObject result3 = QtConcurrent::blockingMappedReduced(
|
||||
pool, sourceObjectList, mapObject, reduceObject);
|
||||
QCOMPARE(result3, expectedResult);
|
||||
QCOMPARE(threadCount(), 1); // ensure the only one thread was working
|
||||
|
||||
const ResultObject result4 = QtConcurrent::blockingMappedReduced(
|
||||
pool, sourceObjectList.constBegin(), sourceObjectList.constEnd(),
|
||||
mapObject, reduceObject);
|
||||
QCOMPARE(result4, expectedResult);
|
||||
QCOMPARE(threadCount(), 1); // ensure the only one thread was working
|
||||
}
|
||||
}
|
||||
|
||||
int intCube(int x)
|
||||
{
|
||||
storeCurrentThread();
|
||||
@ -994,46 +1047,46 @@ void tst_QtConcurrentMap::mappedReducedWithMoveOnlyCallable()
|
||||
const QList<int> intList { 1, 2, 3 };
|
||||
const auto sum = 12;
|
||||
{
|
||||
const auto result = QtConcurrent::mappedReduced<int>(
|
||||
const auto result = QtConcurrent::mappedReduced(
|
||||
intList, MultiplyBy2(), IntSumReduceMoveOnly()).result();
|
||||
QCOMPARE(result, sum);
|
||||
}
|
||||
{
|
||||
const auto result =
|
||||
QtConcurrent::mappedReduced<int>(intList.begin(), intList.end(),
|
||||
QtConcurrent::mappedReduced(intList.begin(), intList.end(),
|
||||
MultiplyBy2(), IntSumReduceMoveOnly()).result();
|
||||
QCOMPARE(result, sum);
|
||||
}
|
||||
{
|
||||
const auto result = QtConcurrent::blockingMappedReduced<int>(intList, MultiplyBy2(),
|
||||
const auto result = QtConcurrent::blockingMappedReduced(intList, MultiplyBy2(),
|
||||
IntSumReduceMoveOnly());
|
||||
QCOMPARE(result, sum);
|
||||
}
|
||||
{
|
||||
const auto result = QtConcurrent::blockingMappedReduced<int>(
|
||||
const auto result = QtConcurrent::blockingMappedReduced(
|
||||
intList.begin(), intList.end(), MultiplyBy2(), IntSumReduceMoveOnly());
|
||||
QCOMPARE(result, sum);
|
||||
}
|
||||
|
||||
QThreadPool pool;
|
||||
{
|
||||
const auto result = QtConcurrent::mappedReduced<int>(&pool, intList, MultiplyBy2(),
|
||||
const auto result = QtConcurrent::mappedReduced(&pool, intList, MultiplyBy2(),
|
||||
IntSumReduceMoveOnly()).result();
|
||||
QCOMPARE(result, sum);
|
||||
}
|
||||
{
|
||||
const auto result =
|
||||
QtConcurrent::mappedReduced<int>(&pool, intList.begin(), intList.end(),
|
||||
QtConcurrent::mappedReduced(&pool, intList.begin(), intList.end(),
|
||||
MultiplyBy2(), IntSumReduceMoveOnly()).result();
|
||||
QCOMPARE(result, sum);
|
||||
}
|
||||
{
|
||||
const auto result = QtConcurrent::blockingMappedReduced<int>(&pool, intList, MultiplyBy2(),
|
||||
const auto result = QtConcurrent::blockingMappedReduced(&pool, intList, MultiplyBy2(),
|
||||
IntSumReduceMoveOnly());
|
||||
QCOMPARE(result, sum);
|
||||
}
|
||||
{
|
||||
const auto result = QtConcurrent::blockingMappedReduced<int>(
|
||||
const auto result = QtConcurrent::blockingMappedReduced(
|
||||
&pool, intList.begin(), intList.end(), MultiplyBy2(), IntSumReduceMoveOnly());
|
||||
QCOMPARE(result, sum);
|
||||
}
|
||||
@ -1095,6 +1148,8 @@ void testMappedReducedInitialValue(const QList<SourceObject> &sourceObjectList,
|
||||
MapObject mapObject,
|
||||
ReduceObject reduceObject,
|
||||
InitialObject &&initialObject)
|
||||
{
|
||||
// Result type is passed explicitly
|
||||
{
|
||||
const ResultObject result1 =
|
||||
QtConcurrent::mappedReduced<ResultObject>(sourceObjectList, mapObject, reduceObject,
|
||||
@ -1111,10 +1166,34 @@ void testMappedReducedInitialValue(const QList<SourceObject> &sourceObjectList,
|
||||
QCOMPARE(result3, expectedResult);
|
||||
|
||||
const ResultObject result4 = QtConcurrent::blockingMappedReduced<ResultObject>(
|
||||
sourceObjectList.constBegin(), sourceObjectList.constEnd(), mapObject, reduceObject, initialObject);
|
||||
sourceObjectList.constBegin(), sourceObjectList.constEnd(),
|
||||
mapObject, reduceObject, initialObject);
|
||||
QCOMPARE(result4, expectedResult);
|
||||
}
|
||||
|
||||
// Result type is deduced
|
||||
{
|
||||
const ResultObject result1 =
|
||||
QtConcurrent::mappedReduced(sourceObjectList, mapObject, reduceObject,
|
||||
initialObject).result();
|
||||
QCOMPARE(result1, expectedResult);
|
||||
|
||||
const ResultObject result2 = QtConcurrent::mappedReduced(
|
||||
sourceObjectList.constBegin(), sourceObjectList.constEnd(),
|
||||
mapObject, reduceObject, initialObject).result();
|
||||
QCOMPARE(result2, expectedResult);
|
||||
|
||||
const ResultObject result3 = QtConcurrent::blockingMappedReduced(
|
||||
sourceObjectList, mapObject, reduceObject, initialObject);
|
||||
QCOMPARE(result3, expectedResult);
|
||||
|
||||
const ResultObject result4 = QtConcurrent::blockingMappedReduced(
|
||||
sourceObjectList.constBegin(), sourceObjectList.constEnd(),
|
||||
mapObject, reduceObject, initialObject);
|
||||
QCOMPARE(result4, expectedResult);
|
||||
}
|
||||
}
|
||||
|
||||
template <typename SourceObject, typename ResultObject, typename InitialObject, typename MapObject, typename ReduceObject>
|
||||
void testMappedReducedInitialValue(const QList<SourceObject> &sourceObjectList,
|
||||
const ResultObject &expectedResult,
|
||||
@ -1233,6 +1312,8 @@ void testMappedReducedInitialValueThreadPool(QThreadPool *pool,
|
||||
MapObject mapObject,
|
||||
ReduceObject reduceObject,
|
||||
InitialObject &&initialObject)
|
||||
{
|
||||
// Result type is passed explicitly
|
||||
{
|
||||
const ResultObject result1 = QtConcurrent::mappedReduced<ResultObject>(
|
||||
pool, sourceObjectList, mapObject, reduceObject, initialObject).result();
|
||||
@ -1258,6 +1339,33 @@ void testMappedReducedInitialValueThreadPool(QThreadPool *pool,
|
||||
QCOMPARE(threadCount(), 1); // ensure the only one thread was working
|
||||
}
|
||||
|
||||
// Result type is deduced
|
||||
{
|
||||
const ResultObject result1 = QtConcurrent::mappedReduced(
|
||||
pool, sourceObjectList, mapObject, reduceObject, initialObject).result();
|
||||
QCOMPARE(result1, expectedResult);
|
||||
QCOMPARE(threadCount(), 1); // ensure the only one thread was working
|
||||
|
||||
const ResultObject result2 =
|
||||
QtConcurrent::mappedReduced(pool, sourceObjectList.constBegin(),
|
||||
sourceObjectList.constEnd(), mapObject,
|
||||
reduceObject, initialObject).result();
|
||||
QCOMPARE(result2, expectedResult);
|
||||
QCOMPARE(threadCount(), 1); // ensure the only one thread was working
|
||||
|
||||
const ResultObject result3 = QtConcurrent::blockingMappedReduced(
|
||||
pool, sourceObjectList, mapObject, reduceObject, initialObject);
|
||||
QCOMPARE(result3, expectedResult);
|
||||
QCOMPARE(threadCount(), 1); // ensure the only one thread was working
|
||||
|
||||
const ResultObject result4 = QtConcurrent::blockingMappedReduced(
|
||||
pool, sourceObjectList.constBegin(), sourceObjectList.constEnd(),
|
||||
mapObject, reduceObject, initialObject);
|
||||
QCOMPARE(result4, expectedResult);
|
||||
QCOMPARE(threadCount(), 1); // ensure the only one thread was working
|
||||
}
|
||||
}
|
||||
|
||||
void tst_QtConcurrentMap::mappedReducedInitialValueThreadPool()
|
||||
{
|
||||
// This is a copy of tst_QtConcurrentMap::mappedReduced with the initial value parameter added
|
||||
@ -1341,23 +1449,23 @@ void tst_QtConcurrentMap::mappedReducedInitialValueWithMoveOnlyCallable()
|
||||
const auto sum = 22;
|
||||
{
|
||||
const auto result =
|
||||
QtConcurrent::mappedReduced<int>(intList, MultiplyBy2(),
|
||||
QtConcurrent::mappedReduced(intList, MultiplyBy2(),
|
||||
IntSumReduceMoveOnly(), initialValue).result();
|
||||
QCOMPARE(result, sum);
|
||||
}
|
||||
{
|
||||
const auto result =
|
||||
QtConcurrent::mappedReduced<int>(intList.begin(), intList.end(), MultiplyBy2(),
|
||||
QtConcurrent::mappedReduced(intList.begin(), intList.end(), MultiplyBy2(),
|
||||
IntSumReduceMoveOnly(), initialValue).result();
|
||||
QCOMPARE(result, sum);
|
||||
}
|
||||
{
|
||||
const auto result = QtConcurrent::blockingMappedReduced<int>(
|
||||
const auto result = QtConcurrent::blockingMappedReduced(
|
||||
intList, MultiplyBy2(), IntSumReduceMoveOnly(), initialValue);
|
||||
QCOMPARE(result, sum);
|
||||
}
|
||||
{
|
||||
const auto result = QtConcurrent::blockingMappedReduced<int>(
|
||||
const auto result = QtConcurrent::blockingMappedReduced(
|
||||
intList.begin(), intList.end(), MultiplyBy2(), IntSumReduceMoveOnly(),
|
||||
initialValue);
|
||||
QCOMPARE(result, sum);
|
||||
@ -1366,23 +1474,23 @@ void tst_QtConcurrentMap::mappedReducedInitialValueWithMoveOnlyCallable()
|
||||
QThreadPool pool;
|
||||
{
|
||||
const auto result =
|
||||
QtConcurrent::mappedReduced<int>(&pool, intList, MultiplyBy2(),
|
||||
QtConcurrent::mappedReduced(&pool, intList, MultiplyBy2(),
|
||||
IntSumReduceMoveOnly(), initialValue).result();
|
||||
QCOMPARE(result, sum);
|
||||
}
|
||||
{
|
||||
const auto result = QtConcurrent::mappedReduced<int>(&pool, intList.begin(), intList.end(),
|
||||
const auto result = QtConcurrent::mappedReduced(&pool, intList.begin(), intList.end(),
|
||||
MultiplyBy2(), IntSumReduceMoveOnly(),
|
||||
initialValue).result();
|
||||
QCOMPARE(result, sum);
|
||||
}
|
||||
{
|
||||
const auto result = QtConcurrent::blockingMappedReduced<int>(
|
||||
const auto result = QtConcurrent::blockingMappedReduced(
|
||||
&pool, intList, MultiplyBy2(), IntSumReduceMoveOnly(), initialValue);
|
||||
QCOMPARE(result, sum);
|
||||
}
|
||||
{
|
||||
const auto result = QtConcurrent::blockingMappedReduced<int>(
|
||||
const auto result = QtConcurrent::blockingMappedReduced(
|
||||
&pool, intList.begin(), intList.end(), MultiplyBy2(), IntSumReduceMoveOnly(),
|
||||
initialValue);
|
||||
QCOMPARE(result, sum);
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user