flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-22 14:55:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Issue #77 Move singleShot from worker.h to threadutils.h

Browse Source
This commit is contained in:
Mat Sutcliffe
2020-08-27 00:45:13 +01:00
parent bb8aeaa3d0
commit 9e0ebef5a1
3 changed files with 30 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/blackmisc/loghandler.cpp
View File

@@ -12,7 +12,7 @@
#include "blackmisc/algorithm.h"
#include "blackmisc/mixin/mixincompare.h"
#include "blackmisc/crashhandler.h"
#include "blackmisc/worker.h"
#include "blackmisc/threadutils.h"
#include "blackconfig/buildconfig.h"
#ifdef BLACK_USE_CRASHPAD

29
src/blackmisc/threadutils.h
View File

@@ -12,11 +12,40 @@
#define BLACKMISC_THREADUTILS_H
#include "blackmisc/blackmiscexport.h"
#include "blackmisc/stacktrace.h"
#include "blackmisc/promise.h"
#include <QTimer>
#include <QThread>
#include <QObject>
#include <QMetaObject>
#include <QSharedPointer>
#include <functional>
namespace BlackMisc
{
/*!
* Starts a single-shot timer which will call a task in the thread of the given object when it times out.
*
* Differs from QTimer::singleShot in that this implementation interacts better with QObject::moveToThread,
* and returns a QFuture which can be used to detect when the task has finished or obtain its return value.
*/
template <typename F>
auto singleShot(int msec, QObject *target, F &&task)
{
CPromise<decltype(task())> promise;
QSharedPointer<QTimer> timer(new QTimer, [](QObject * o) { QMetaObject::invokeMethod(o, &QObject::deleteLater); });
timer->setSingleShot(true);
timer->moveToThread(target->thread());
QObject::connect(timer.data(), &QTimer::timeout, target, [trace = getStackTrace(), task = std::forward<F>(task), timer, promise]() mutable
{
static_cast<void>(trace);
timer.clear();
promise.setResultFrom(task);
});
QMetaObject::invokeMethod(timer.data(), [t = timer.data(), msec] { t->start(msec); });
return promise.future();
}
/*!
* Utility class for threaded operations
*/

23
src/blackmisc/worker.h
View File

@@ -42,29 +42,6 @@
namespace BlackMisc
{
/*!
* Starts a single-shot timer which will call a task in the thread of the given object when it times out.
*
* Differs from QTimer::singleShot in that this implementation interacts better with QObject::moveToThread,
* and returns a QFuture which can be used to detect when the task has finished or obtain its return value.
*/
template <typename F>
auto singleShot(int msec, QObject *target, F &&task)
{
CPromise<decltype(task())> promise;
QSharedPointer<QTimer> timer(new QTimer, [](QObject * o) { QMetaObject::invokeMethod(o, &QObject::deleteLater); });
timer->setSingleShot(true);
timer->moveToThread(target->thread());
QObject::connect(timer.data(), &QTimer::timeout, target, [trace = getStackTrace(), task = std::forward<F>(task), timer, promise]() mutable
{
static_cast<void>(trace);
timer.clear();
promise.setResultFrom(task);
});
QMetaObject::invokeMethod(timer.data(), [t = timer.data(), msec] { t->start(msec); });
return promise.future();
}
/*!
* Just a subclass of QThread whose destructor waits for the thread to finish.
*/