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

Delete QDBusServiceWatcher when unloading X-Plane driver.

Browse Source 
Summary:
When unloading a sim driver, first its threads are killed, then the driver object is destroyed.

This means that when the `QDBusServiceWatcher` child object is destroyed, it deadlocks waiting for a thread that was already killed (T147).

This change causes the `QDBusServiceWatcher` to be deleted before the driver is unloaded.

Reviewers: #swift_pilot_client, kbasan, rwinklmeier

Reviewed By: #swift_pilot_client, kbasan, rwinklmeier

Subscribers: kbasan, jenkins

Tags: #swift_pilot_client

Differential Revision: https://dev.swift-project.org/D50
This commit is contained in:
Mathew Sutcliffe
2017-09-08 17:49:00 +01:00
parent e2b00f1f9b
commit f1211d328e
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/simulator/xplane/simulatorxplane.cpp
View File

@@ -113,6 +113,13 @@ namespace BlackSimPlugin
resetData(); resetData();
} }
void CSimulatorXPlane::unload()
{
CSimulatorCommon::unload();
delete m_watcher;
m_watcher = nullptr;
}
// convert xplane squawk mode to swift squawk mode // convert xplane squawk mode to swift squawk mode
BlackMisc::Aviation::CTransponder::TransponderMode xpdrMode(int xplaneMode, bool ident) BlackMisc::Aviation::CTransponder::TransponderMode xpdrMode(int xplaneMode, bool ident)
{ {
@@ -255,7 +262,7 @@ namespace BlackSimPlugin
connect(m_traffic, &CXSwiftBusTrafficProxy::installedModelsUpdated, this, &CSimulatorXPlane::ps_installedModelsUpdated); connect(m_traffic, &CXSwiftBusTrafficProxy::installedModelsUpdated, this, &CSimulatorXPlane::ps_installedModelsUpdated);
m_service->updateAirportsInRange(); m_service->updateAirportsInRange();
m_traffic->updateInstalledModels(); m_traffic->updateInstalledModels();
m_watcher->setConnection(m_conn); if (m_watcher) { m_watcher->setConnection(m_conn); }
loadCslPackages(); loadCslPackages();
emitSimulatorCombinedStatus(); emitSimulatorCombinedStatus();
return true; return true;
@@ -276,7 +283,7 @@ namespace BlackSimPlugin
} }
m_conn = QDBusConnection { "default" }; m_conn = QDBusConnection { "default" };
m_watcher->setConnection(m_conn); if (m_watcher) { m_watcher->setConnection(m_conn); }
delete m_service; delete m_service;
delete m_traffic; delete m_traffic;
delete m_weather; delete m_weather;
@@ -290,7 +297,7 @@ namespace BlackSimPlugin
void CSimulatorXPlane::ps_serviceUnregistered() void CSimulatorXPlane::ps_serviceUnregistered()
{ {
m_conn = QDBusConnection { "default" }; m_conn = QDBusConnection { "default" };
m_watcher->setConnection(m_conn); if (m_watcher) { m_watcher->setConnection(m_conn); }
delete m_service; delete m_service;
delete m_traffic; delete m_traffic;
delete m_weather; delete m_weather;
@@ -746,7 +753,7 @@ namespace BlackSimPlugin
{ {
if (m_watcher) if (m_watcher)
{ {
m_watcher->deleteLater(); delete m_watcher;
m_watcher = nullptr; m_watcher = nullptr;
} }
} }

1
src/plugins/simulator/xplane/simulatorxplane.h
View File

@@ -100,6 +100,7 @@ namespace BlackSimPlugin
virtual bool setTimeSynchronization(bool enable, const BlackMisc::PhysicalQuantities::CTime &offset) override; virtual bool setTimeSynchronization(bool enable, const BlackMisc::PhysicalQuantities::CTime &offset) override;
virtual BlackMisc::PhysicalQuantities::CTime getTimeSynchronizationOffset() const override { return BlackMisc::PhysicalQuantities::CTime(0, BlackMisc::PhysicalQuantities::CTimeUnit::hrmin()); } virtual BlackMisc::PhysicalQuantities::CTime getTimeSynchronizationOffset() const override { return BlackMisc::PhysicalQuantities::CTime(0, BlackMisc::PhysicalQuantities::CTimeUnit::hrmin()); }
virtual bool setInterpolatorMode(BlackMisc::Simulation::CInterpolatorMulti::Mode mode, const BlackMisc::Aviation::CCallsign &callsign) override; virtual bool setInterpolatorMode(BlackMisc::Simulation::CInterpolatorMulti::Mode mode, const BlackMisc::Aviation::CCallsign &callsign) override;
virtual void unload() override;
//! @} //! @}
//! Creates an appropriate dbus connection from the string describing it //! Creates an appropriate dbus connection from the string describing it