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

refs #659 Use a threadsafe queue for admit(), to avoid a race with synchronize().

Browse Source
This commit is contained in:
Mathew Sutcliffe
2016-05-29 14:21:29 +01:00
parent f1a9ae5a13
commit 5559d1fcc6
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/blackmisc/datacache.h
View File

@@ -163,6 +163,7 @@ namespace BlackMisc
QSet<QString> m_pinnedValues;
QSet<QString> m_deferredValues;
QSet<QString> m_admittedValues;
QSet<QString> m_admittedQueue;
std::vector<std::promise<void>> m_promises;
static QJsonObject toJson(const QMap<QString, qint64> &timestamps);
@@ -311,7 +312,7 @@ namespace BlackMisc
void renewTimestamp(qint64 timestamp) { return CDataCache::instance()->renewTimestamp(this->getKey(), timestamp); }
//! If the value is load-deferred, trigger the deferred load (async).
void admit() { CDataCache::instance()->admitValue(Trait::key(), true); }
void admit() { if (Trait::isDeferred()) { CDataCache::instance()->admitValue(Trait::key(), true); } }
//! If the value is currently being loaded, wait for it to finish loading, and call the notification slot, if any.
void synchronize()