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

refs #287 Thread safety, fix "memory access violation"

Browse Source 
* some improved comments and information
* QMetaObject::invokeMethod in tool.cpp as thread safe invocation
* common base class for threaded readers
* removed event class, using QMetaObject::invoke instead for forcing calls in main event loop
* stop methods for readers, as used for graceful shutdown (preparing for thread safe destruction of objects)
* graceful shutdown for network context
* calls in tool now via inkoke for thread safety (only thread safe methods called directly)
This commit is contained in:
Klaus Basan
2014-07-01 19:11:25 +02:00
parent c03d45123d
commit d9a1c0cc8c
16 changed files with 522 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/blackcore/context_runtime.cpp
View File

@@ -1,4 +1,3 @@
#include "blackcore/context_runtime.h"
#include "blackcore/context_all_impl.h"
#include "blackcore/context_all_proxies.h"
#include "blackcore/blackcorefreefunctions.h"
@@ -9,6 +8,7 @@
#include "blackmisc/statusmessagelist.h"
#include "blackmisc/avaircraft.h"
#include "blackmisc/blackmiscfreefunctions.h"
#include "blackcore/context_runtime.h"
#include <QDebug>
@@ -58,6 +58,7 @@ namespace BlackCore
*/
bool CRuntime::signalLogForApplication(bool enabled)
{
QWriteLocker wl(&m_lock);
if (enabled == this->m_signalLogApplication) return enabled;
if (!this->getIContextApplication())
{
@@ -88,6 +89,7 @@ namespace BlackCore
bool CRuntime::signalLogForAudio(bool enabled)
{
QWriteLocker wl(&m_lock);
if (enabled == this->m_signalLogAudio) return enabled;
if (!this->getIContextNetwork())
{
@@ -114,6 +116,7 @@ namespace BlackCore
*/
bool CRuntime::signalLogForNetwork(bool enabled)
{
QWriteLocker wl(&m_lock);
if (enabled == this->m_signalLogNetwork) return enabled;
if (!this->getIContextNetwork())
{
@@ -152,6 +155,7 @@ namespace BlackCore
*/
bool CRuntime::signalLogForOwnAircraft(bool enabled)
{
QWriteLocker wl(&m_lock);
if (enabled == this->m_signalLogOwnAircraft) return enabled;
if (!this->getIContextOwnAircraft())
{
@@ -188,6 +192,7 @@ namespace BlackCore
*/
bool CRuntime::signalLogForSettings(bool enabled)
{
QWriteLocker wl(&m_lock);
if (enabled == this->m_signalLogSettings) return enabled;
if (!this->getIContextSettings())
{
@@ -214,6 +219,7 @@ namespace BlackCore
*/
bool CRuntime::signalLogForSimulator(bool enabled)
{
QWriteLocker wl(&m_lock);
if (enabled == this->m_signalLogSimulator) return enabled;
if (!this->getIContextSimulator())
{
@@ -285,12 +291,12 @@ namespace BlackCore
switch (context)
{
default: return true;
case LogForApplication: return this->m_slotLogApplication;
case LogForAudio: return this->m_slotLogAudio;
case LogForNetwork: return this->m_slotLogNetwork;
case LogForOwnAircraft: return this->m_slotLogOwnAircraft;
case LogForSettings: return this->m_slotLogSettings;
case LogForSimulator: return this->m_slotLogSimulator;
case LogForApplication: return this->isSlotLogForApplicationEnabled();
case LogForAudio: return this->isSlotLogForAudioEnabled();
case LogForNetwork: return this->isSlotLogForNetworkEnabled();
case LogForOwnAircraft: return this->isSlotLogForOwnAircraftEnabled();
case LogForSettings: return this->isSlotLogForSettingsEnabled();
case LogForSimulator: return this->isSlotLogForSimulatorEnabled();
}
}
@@ -496,6 +502,10 @@ namespace BlackCore
{
disconnect(this->getIContextNetwork());
this->getIContextNetwork()->disconnectFromNetwork();
if (this->m_contextNetwork->usingLocalObjects())
{
this->getCContextNetwork()->gracefulShutdown(); // for threads
}
this->getIContextNetwork()->deleteLater();
this->m_contextNetwork = nullptr;
}
@@ -663,8 +673,6 @@ namespace BlackCore
return static_cast<CContextNetwork *>(this->m_contextNetwork);
}
CContextOwnAircraft *CRuntime::getCContextOwnAircraft()
{
Q_ASSERT_X(!this->m_contextOwnAircraft || this->m_contextOwnAircraft->usingLocalObjects(), "CCoreRuntime", "Cannot downcast to local object");