diff options
Diffstat (limited to 'src/concurrent/qtconcurrentrunbase.h')
-rw-r--r-- | src/concurrent/qtconcurrentrunbase.h | 114 |
1 files changed, 25 insertions, 89 deletions
diff --git a/src/concurrent/qtconcurrentrunbase.h b/src/concurrent/qtconcurrentrunbase.h index 5e9fa0aa00..d687cc4c9e 100644 --- a/src/concurrent/qtconcurrentrunbase.h +++ b/src/concurrent/qtconcurrentrunbase.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_RUNBASE_H #define QTCONCURRENT_RUNBASE_H @@ -79,7 +43,7 @@ struct TaskStartParameters }; template <typename T> -class RunFunctionTaskBase : public QFutureInterface<T> , public QRunnable +class RunFunctionTaskBase : public QRunnable { public: QFuture<T> start() @@ -89,76 +53,48 @@ public: QFuture<T> start(const TaskStartParameters ¶meters) { - this->setThreadPool(parameters.threadPool); - this->setRunnable(this); - this->reportStarted(); - QFuture<T> theFuture = this->future(); - parameters.threadPool->start(this, parameters.priority); + promise.setThreadPool(parameters.threadPool); + promise.setRunnable(this); + promise.reportStarted(); + QFuture<T> theFuture = promise.future(); + + if (parameters.threadPool) { + parameters.threadPool->start(this, parameters.priority); + } else { + promise.reportCanceled(); + promise.reportFinished(); + delete this; + } return theFuture; } // For backward compatibility QFuture<T> start(QThreadPool *pool) { return start({pool, 0}); } - void run() override {} - virtual void runFunctor() = 0; -}; - -template <typename T> -class RunFunctionTask : public RunFunctionTaskBase<T> -{ -public: void run() override { - if (this->isCanceled()) { - this->reportFinished(); + if (promise.isCanceled()) { + promise.reportFinished(); return; } #ifndef QT_NO_EXCEPTIONS try { #endif - this->runFunctor(); + runFunctor(); #ifndef QT_NO_EXCEPTIONS } catch (QException &e) { - QFutureInterface<T>::reportException(e); + promise.reportException(e); } catch (...) { - QFutureInterface<T>::reportException(QUnhandledException()); + promise.reportException(QUnhandledException(std::current_exception())); } #endif - - if constexpr (std::is_move_constructible_v<T>) - this->reportAndMoveResult(std::move(result)); - else if constexpr (std::is_copy_constructible_v<T>) - this->reportResult(result); - - this->reportFinished(); + promise.reportFinished(); } - T result; -}; -template <> -class RunFunctionTask<void> : public RunFunctionTaskBase<void> -{ -public: - void run() override - { - if (this->isCanceled()) { - this->reportFinished(); - return; - } -#ifndef QT_NO_EXCEPTIONS - try { -#endif - this->runFunctor(); -#ifndef QT_NO_EXCEPTIONS - } catch (QException &e) { - QFutureInterface<void>::reportException(e); - } catch (...) { - QFutureInterface<void>::reportException(QUnhandledException()); - } -#endif - this->reportFinished(); - } +protected: + virtual void runFunctor() = 0; + + QFutureInterface<T> promise; }; } //namespace QtConcurrent |