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

Improved graceful shutdown, added "m_shutdownInProgress"

Browse Source 
* no assert when wait is called in same thread, just ignore wait
* quitAndWait readers, also works if not already noved in new thread (see above)
This commit is contained in:
Klaus Basan
2018-03-19 21:04:17 +01:00
parent 9dabef447f
commit d6fd53287f
8 changed files with 71 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/blackmisc/worker.cpp
View File

@@ -36,7 +36,7 @@ namespace BlackMisc
auto handle = m_handle.load();
if (handle)
{
auto status = WaitForSingleObject(handle, 0);
const auto status = WaitForSingleObject(handle, 0);
if (isRunning())
{
switch (status)
@@ -50,7 +50,12 @@ namespace BlackMisc
}
#endif
quit();
const qint64 beforeWait = QDateTime::currentMSecsSinceEpoch();
wait(30 * 1000); //! \todo KB 2017-10 temp workaround: in T145 this will be fixed, sometimes (very rarely) hanging here during shutdown
const qint64 delta = QDateTime::currentMSecsSinceEpoch() - beforeWait;
BLACK_VERIFY_X(delta < 30 * 1000, Q_FUNC_INFO, "Wait timeout");
Q_UNUSED(delta);
}
CWorker *CWorker::fromTaskImpl(QObject *owner, const QString &name, int typeId, std::function<CVariant()> task)
@@ -67,7 +72,7 @@ namespace BlackMisc
worker->setObjectName(name);
worker->moveToThread(thread);
bool s = QMetaObject::invokeMethod(worker, "ps_runTask");
const bool s = QMetaObject::invokeMethod(worker, "ps_runTask");
Q_ASSERT_X(s, Q_FUNC_INFO, "cannot invoke");
Q_UNUSED(s);
thread->start();
@@ -153,21 +158,31 @@ namespace BlackMisc
void CContinuousWorker::quit() noexcept
{
Q_ASSERT_X(!CThreadUtils::isApplicationThreadObjectThread(this), Q_FUNC_INFO, "Try to stop main thread");
setEnabled(false);
this->setEnabled(false);
// already in different thread? otherwise return
if (CThreadUtils::isApplicationThreadObjectThread(this)) { return; }
// remark: cannot stop timer here, as I am normally not in the correct thread
thread()->quit();
}
void CContinuousWorker::quitAndWait() noexcept
{
Q_ASSERT_X(!CThreadUtils::isApplicationThreadObjectThread(this), Q_FUNC_INFO, "Try to stop main thread");
Q_ASSERT_X(!CThreadUtils::isCurrentThreadObjectThread(this), Q_FUNC_INFO, "Called by own thread, will deadlock");
this->quit();
setEnabled(false);
// already in different thread? otherwise return
if (CThreadUtils::isApplicationThreadObjectThread(this)) { return; }
// Called by own thread, will deadlock, return
if (CThreadUtils::isCurrentThreadObjectThread(this)) { return; }
auto *ownThread = thread();
quit();
ownThread->wait();
const qint64 beforeWait = QDateTime::currentMSecsSinceEpoch();
ownThread->wait(30 * 1000); //! \todo KB 2017-10 temp workaround: in T145 this will be fixed, sometimes (very rarely) hanging here during shutdown
const qint64 delta = QDateTime::currentMSecsSinceEpoch() - beforeWait;
BLACK_VERIFY_X(delta < 30 * 1000, Q_FUNC_INFO, "Wait timeout");
Q_UNUSED(delta);
}
void CContinuousWorker::startUpdating(int updateTimeSecs)