diff options
Diffstat (limited to 'src/concurrent/qtconcurrentstoredfunctioncall.h')
| -rw-r--r-- | src/concurrent/qtconcurrentstoredfunctioncall.h | 158 |
1 files changed, 97 insertions, 61 deletions
diff --git a/src/concurrent/qtconcurrentstoredfunctioncall.h b/src/concurrent/qtconcurrentstoredfunctioncall.h index 44a93360d8..e9c66a63ff 100644 --- a/src/concurrent/qtconcurrentstoredfunctioncall.h +++ b/src/concurrent/qtconcurrentstoredfunctioncall.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtConcurrent 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 The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/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 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QTCONCURRENT_STOREDFUNCTIONCALL_H #define QTCONCURRENT_STOREDFUNCTIONCALL_H @@ -44,10 +8,10 @@ #ifndef QT_NO_CONCURRENT #include <QtConcurrent/qtconcurrentrunbase.h> -#include <type_traits> - #include <QtCore/qpromise.h> +#include <type_traits> + QT_BEGIN_NAMESPACE #ifndef Q_QDOC @@ -66,9 +30,10 @@ struct NonMemberFunctionResolver<Function, PromiseType, Args...> static_assert(std::is_void_v<std::invoke_result_t<std::decay_t<Function>, QPromise<PromiseType> &, std::decay_t<Args>...>>, "The function must return void type."); - static constexpr decltype (auto) invokePointer() + static constexpr void invoke(std::decay_t<Function> function, QPromise<PromiseType> &promise, + std::decay_t<Args>... args) { - return &std::invoke<std::decay_t<Function>, QPromise<PromiseType> &, std::decay_t<Args>...>; + std::invoke(function, promise, args...); } static Type initData(Function &&f, QPromise<PromiseType> &promise, Args &&...args) { @@ -88,9 +53,10 @@ struct MemberFunctionResolver<Function, PromiseType, Arg, Args...> static_assert(std::is_void_v<std::invoke_result_t<std::decay_t<Function>, std::decay_t<Arg>, QPromise<PromiseType> &, std::decay_t<Args>...>>, "The function must return void type."); - static constexpr decltype (auto) invokePointer() + static constexpr void invoke(std::decay_t<Function> function, std::decay_t<Arg> object, + QPromise<PromiseType> &promise, std::decay_t<Args>... args) { - return &std::invoke<std::decay_t<Function>, std::decay_t<Arg>, QPromise<PromiseType> &, std::decay_t<Args>...>; + std::invoke(function, object, promise, args...); } static Type initData(Function &&f, QPromise<PromiseType> &promise, Arg &&fa, Args &&...args) { @@ -102,17 +68,21 @@ template <class IsMember, class Function, class PromiseType, class... Args> struct FunctionResolverHelper; template <class Function, class PromiseType, class... Args> -struct FunctionResolverHelper<std::false_type, Function, PromiseType, Args...> : public NonMemberFunctionResolver<Function, PromiseType, Args...> +struct FunctionResolverHelper<std::false_type, Function, PromiseType, Args...> + : public NonMemberFunctionResolver<Function, PromiseType, Args...> { }; template <class Function, class PromiseType, class... Args> -struct FunctionResolverHelper<std::true_type, Function, PromiseType, Args...> : public MemberFunctionResolver<Function, PromiseType, Args...> +struct FunctionResolverHelper<std::true_type, Function, PromiseType, Args...> + : public MemberFunctionResolver<Function, PromiseType, Args...> { }; template <class Function, class PromiseType, class... Args> -struct FunctionResolver : public FunctionResolverHelper<typename std::is_member_function_pointer<std::decay_t<Function>>::type, Function, PromiseType, Args...> +struct FunctionResolver + : public FunctionResolverHelper<typename std::is_member_function_pointer< + std::decay_t<Function>>::type, Function, PromiseType, Args...> { }; @@ -132,12 +102,8 @@ template <class ...Types> using DecayedTuple = std::tuple<std::decay_t<Types>...>; template <class Function, class ...Args> -struct StoredFunctionCall : public RunFunctionTask<InvokeResultType<Function, Args...>> +struct StoredFunctionCall : public RunFunctionTaskBase<InvokeResultType<Function, Args...>> { - StoredFunctionCall(Function &&f, Args &&...args) - : data{std::forward<Function>(f), std::forward<Args>(args)...} - {} - StoredFunctionCall(DecayedTuple<Function, Args...> &&_data) : data(std::move(_data)) {} @@ -145,13 +111,22 @@ struct StoredFunctionCall : public RunFunctionTask<InvokeResultType<Function, Ar protected: void runFunctor() override { - constexpr auto invoke = &std::invoke<std::decay_t<Function>, - std::decay_t<Args>...>; + constexpr auto invoke = [] (std::decay_t<Function> function, + std::decay_t<Args>... args) -> auto { + return std::invoke(function, args...); + }; - if constexpr (std::is_void_v<InvokeResultType<Function, Args...>>) + if constexpr (std::is_void_v<InvokeResultType<Function, Args...>>) { std::apply(invoke, std::move(data)); - else - this->result = std::apply(invoke, std::move(data)); + } else { + auto result = std::apply(invoke, std::move(data)); + + using T = InvokeResultType<Function, Args...>; + if constexpr (std::is_move_constructible_v<T>) + this->promise.reportAndMoveResult(std::move(result)); + else if constexpr (std::is_copy_constructible_v<T>) + this->promise.reportResult(result); + } } private: @@ -165,24 +140,85 @@ struct StoredFunctionCallWithPromise : public RunFunctionTaskBase<PromiseType> using DataType = typename Resolver::Type; StoredFunctionCallWithPromise(Function &&f, Args &&...args) : prom(this->promise), - data(std::move(Resolver::initData(std::forward<Function>(f), std::ref(prom), std::forward<Args>(args)...))) + data(std::move(Resolver::initData(std::forward<Function>(f), std::ref(prom), + std::forward<Args>(args)...))) {} - StoredFunctionCallWithPromise(DataType &&_data) - : data(std::move(_data)) + StoredFunctionCallWithPromise(DecayedTuple<Function, Args...> &&_data) + : StoredFunctionCallWithPromise(std::move(_data), + std::index_sequence_for<std::decay_t<Function>, std::decay_t<Args>...>()) {} protected: void runFunctor() override { - std::apply(Resolver::invokePointer(), std::move(data)); + std::apply(Resolver::invoke, std::move(data)); } private: + // helper to pack back the tuple into parameter pack + template<std::size_t... Is> + StoredFunctionCallWithPromise(DecayedTuple<Function, Args...> &&_data, + std::index_sequence<Is...>) + : StoredFunctionCallWithPromise(std::move(std::get<Is>(_data))...) + {} + QPromise<PromiseType> prom; DataType data; }; +template<typename...> +struct NonPromiseTaskResolver; + +template <typename Function, typename ... Args> +struct NonPromiseTaskResolver<Function, Args...> +{ + using TaskWithArgs = DecayedTuple<Function, Args...>; + static auto run(TaskWithArgs &&args, const TaskStartParameters &startParameters) { + return (new StoredFunctionCall<Function, Args...>(std::move(args))) + ->start(startParameters); + } +}; + +template<typename...> +struct PromiseTaskResolver; + +template <typename Function, typename ... Args> +struct PromiseTaskResolver<Function, Args...> +{ + static_assert(QtPrivate::ArgResolver<Function>::IsPromise::value, + "The first argument of passed callable object isn't a QPromise<T> & type. " + "Did you intend to pass a callable which takes a QPromise<T> & type as a first argument? " + "Otherwise it's not possible to invoke the function with passed arguments."); + using TaskWithArgs = DecayedTuple<Function, Args...>; + static auto run(TaskWithArgs &&args, const TaskStartParameters &startParameters) { + using PromiseType = typename QtPrivate::ArgResolver<Function>::PromiseType; + return (new StoredFunctionCallWithPromise<Function, PromiseType, Args...>(std::move(args))) + ->start(startParameters); + } +}; + +template <class IsDirectlyInvocable, class Function, class... Args> +struct TaskResolverHelper; + +template <class Function, class... Args> +struct TaskResolverHelper<std::true_type, Function, Args...> + : public NonPromiseTaskResolver<Function, Args...> +{ +}; + +template <class Function, class... Args> +struct TaskResolverHelper<std::false_type, Function, Args...> + : public PromiseTaskResolver<Function, Args...> +{ +}; + +template <class Function, class... Args> +struct TaskResolver : public TaskResolverHelper<typename std::is_invocable<std::decay_t<Function>, + std::decay_t<Args>...>::type, Function, Args...> +{ +}; + } //namespace QtConcurrent #endif // Q_QDOC |