flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-06 10:15:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #369, thread safe access to aircraft parts, situations

Browse Source
This commit is contained in:
Klaus Basan
2015-02-13 21:54:53 +01:00
parent c47871b813
commit 38a8c45b9e
8 changed files with 165 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/blackcore/context_ownaircraft_impl.cpp
View File

@@ -39,9 +39,20 @@ namespace BlackCore
CContextOwnAircraft::~CContextOwnAircraft() { }
/*
* Init own aircraft
*/
const CSimulatedAircraft &CContextOwnAircraft::ownAircraft() const
{
// not thread safe, check
Q_ASSERT(this->thread() == QThread::currentThread());
return this->m_ownAircraft;
}
CSimulatedAircraft &CContextOwnAircraft::ownAircraft()
{
// not thread safe, check
Q_ASSERT(this->thread() == QThread::currentThread());
return this->m_ownAircraft;
}
void CContextOwnAircraft::initOwnAircraft()
{
Q_ASSERT(this->getRuntime());
@@ -202,7 +213,16 @@ namespace BlackCore
CSimulatedAircraft CContextOwnAircraft::getOwnAircraft() const
{
CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << this->m_ownAircraft;
return this->m_ownAircraft;
if (this->thread() == QThread::currentThread()) { return this->m_ownAircraft; }
CSimulatedAircraft aircraft;
bool s = QMetaObject::invokeMethod(const_cast<CContextOwnAircraft *>(this), // strip away const, invoke will not change anything
"getOwnAircraft",
Qt::BlockingQueuedConnection,
Q_RETURN_ARG(CSimulatedAircraft, aircraft)
);
Q_ASSERT(s);
Q_UNUSED(s);
return aircraft;
}
bool CContextOwnAircraft::parseCommandLine(const QString &commandLine)