1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QtConcurrent: Get rid of code repetition for RunFunctionTask::run()

Browse Source 
Change-Id: If270982e54d2b11be00c71b9d012af629d181dfe
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
This commit is contained in:
Jarek Kobus 2020-07-10 13:07:42 +02:00
parent 974e55bd70
commit b91a5d053d
2 changed files with 21 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/concurrent/qtconcurrentrunbase.h
View File

@ -100,14 +100,6 @@ public:
// For backward compatibility // For backward compatibility
QFuture<T> start(QThreadPool *pool) { return start({pool, 0}); } 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 void run() override
{ {
if (this->isCanceled()) { if (this->isCanceled()) {
@ -117,7 +109,7 @@ public:
#ifndef QT_NO_EXCEPTIONS #ifndef QT_NO_EXCEPTIONS
try { try {
#endif #endif
this->runFunctor(); runFunctor();
#ifndef QT_NO_EXCEPTIONS #ifndef QT_NO_EXCEPTIONS
} catch (QException &e) { } catch (QException &e) {
QFutureInterface<T>::reportException(e); QFutureInterface<T>::reportException(e);
@ -126,40 +118,33 @@ public:
} }
#endif #endif
reportResult();
this->reportFinished();
}
protected:
virtual void runFunctor() = 0;
virtual void reportResult() {}
};
template <typename T>
class RunFunctionTask : public RunFunctionTaskBase<T>
{
protected:
void reportResult() override
{
if constexpr (std::is_move_constructible_v<T>) if constexpr (std::is_move_constructible_v<T>)
this->reportAndMoveResult(std::move(result)); this->reportAndMoveResult(std::move(result));
else if constexpr (std::is_copy_constructible_v<T>) else if constexpr (std::is_copy_constructible_v<T>)
this->reportResult(result); this->reportResult(result);
this->reportFinished();
} }
T result; T result;
}; };
template <> template <>
class RunFunctionTask<void> : public RunFunctionTaskBase<void> 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();
}
};
} //namespace QtConcurrent } //namespace QtConcurrent

2
src/concurrent/qtconcurrentstoredfunctioncall.h
View File

@ -78,6 +78,7 @@ struct StoredFunctionCall : public RunFunctionTask<InvokeResultType<Function, Ar
: data(std::move(_data)) : data(std::move(_data))
{} {}
protected:
void runFunctor() override void runFunctor() override
{ {
constexpr auto invoke = &std::invoke<std::decay_t<Function>, constexpr auto invoke = &std::invoke<std::decay_t<Function>,
@ -89,6 +90,7 @@ struct StoredFunctionCall : public RunFunctionTask<InvokeResultType<Function, Ar
this->result = std::apply(invoke, std::move(data)); this->result = std::apply(invoke, std::move(data));
} }
private:
DecayedTuple<Function, Args...> data; DecayedTuple<Function, Args...> data;
}; };