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

refs #649, with #659 deferred caches available

Browse Source 
* adjustments to use deferred caches
* removed simulator from CAircraftModelSetLoader`s signature as it was not used
* only change current simulator when explicitly set (avoid unintended setting)
* added function to obtain number of elements from model caches
This commit is contained in:
Klaus Basan
2016-05-29 12:37:03 +02:00
parent 771c531125
commit 875b311ede
19 changed files with 123 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/blackcore/db/databasereader.cpp
View File

@@ -51,7 +51,6 @@ namespace BlackCore
CEntityFlags::Entity allEntities = entities;
CEntityFlags::Entity currentEntity = CEntityFlags::iterateDbEntities(allEntities); // CEntityFlags::InfoObjectEntity will be ignored
const bool hasInfoObjects = this->hasInfoObjects();
const bool changedUrl = this->hasChangedUrl(currentEntity);
while (currentEntity)
{
const CDatabaseReaderConfig config(this->getConfigForEntity(currentEntity));
@@ -59,6 +58,7 @@ namespace BlackCore
{
if (hasInfoObjects)
{
const bool changedUrl = this->hasChangedUrl(currentEntity);
const QDateTime cacheTs(this->getCacheTimestamp(currentEntity));
const QDateTime latestEntityTs(this->getLatestEntityTimestamp(currentEntity));
const qint64 cacheTimestamp = cacheTs.isValid() ? cacheTs.toMSecsSinceEpoch() : -1;
@@ -76,7 +76,8 @@ namespace BlackCore
{
if (changedUrl)
{
CLogMessage(this).info("Data location changed, will override cache");
CLogMessage(this).info("Data location changed, will override cache for %1")
<< CEntityFlags::flagToString(currentEntity);
}
else
{
@@ -90,7 +91,11 @@ namespace BlackCore
{
// no info objects, server down
this->syncronizeCaches(currentEntity);
CLogMessage(this).info("No info object for %1, using cache") << CEntityFlags::flagToString(currentEntity);
const int c = this->getCacheCount(currentEntity);
CLogMessage(this).info("No info object for %1, using cache with %2 objects")
<< CEntityFlags::flagToString(currentEntity)
<< c;
entities &= ~currentEntity; // do not load from web
}
}
currentEntity = CEntityFlags::iterateDbEntities(allEntities);

5
src/blackcore/db/databasereader.h
View File

@@ -149,7 +149,10 @@ namespace BlackCore
virtual void syncronizeCaches(BlackMisc::Network::CEntityFlags::Entity entities) = 0;
//! Cache`s timestamp for given entity
virtual QDateTime getCacheTimestamp(BlackMisc::Network::CEntityFlags::Entity entities) = 0;
virtual QDateTime getCacheTimestamp(BlackMisc::Network::CEntityFlags::Entity entities) const = 0;
//! Cache`s number of entities
virtual int getCacheCount(BlackMisc::Network::CEntityFlags::Entity entity) const = 0;
//! Invalidate the caches for given entities
virtual void invalidateCaches(BlackMisc::Network::CEntityFlags::Entity entities) = 0;

13
src/blackcore/db/icaodatareader.cpp
View File

@@ -399,7 +399,7 @@ namespace BlackCore
if (entities.testFlag(CEntityFlags::CountryEntity)) {CDataCache::instance()->clearAllValues(this->m_countryCache.getKey()); }
}
QDateTime CIcaoDataReader::getCacheTimestamp(CEntityFlags::Entity entity)
QDateTime CIcaoDataReader::getCacheTimestamp(CEntityFlags::Entity entity) const
{
switch (entity)
{
@@ -410,6 +410,17 @@ namespace BlackCore
}
}
int CIcaoDataReader::getCacheCount(CEntityFlags::Entity entity) const
{
switch (entity)
{
case CEntityFlags::AircraftIcaoEntity: return this->m_aircraftIcaoCache.getCopy().size();
case CEntityFlags::AirlineIcaoEntity: return this->m_airlineIcaoCache.getCopy().size();
case CEntityFlags::CountryEntity: return this->m_countryCache.getCopy().size();
default: return 0;
}
}
bool CIcaoDataReader::hasChangedUrl(CEntityFlags::Entity entity) const
{
Q_UNUSED(entity);

3
src/blackcore/db/icaodatareader.h
View File

@@ -123,7 +123,8 @@ namespace BlackCore
//! @{
virtual void syncronizeCaches(BlackMisc::Network::CEntityFlags::Entity entities) override;
virtual void invalidateCaches(BlackMisc::Network::CEntityFlags::Entity entities) override;
virtual QDateTime getCacheTimestamp(BlackMisc::Network::CEntityFlags::Entity entity) override;
virtual QDateTime getCacheTimestamp(BlackMisc::Network::CEntityFlags::Entity entity) const override;
virtual int getCacheCount(BlackMisc::Network::CEntityFlags::Entity entity) const override;
virtual bool hasChangedUrl(BlackMisc::Network::CEntityFlags::Entity entity) const override;
//! @}

9
src/blackcore/db/infodatareader.cpp
View File

@@ -62,13 +62,20 @@ namespace BlackCore
Q_UNUSED(entities);
}
QDateTime CInfoDataReader::getCacheTimestamp(CEntityFlags::Entity entity)
QDateTime CInfoDataReader::getCacheTimestamp(CEntityFlags::Entity entity) const
{
// no caching used here
Q_UNUSED(entity);
return QDateTime();
}
int CInfoDataReader::getCacheCount(CEntityFlags::Entity entity) const
{
// no caching used here
Q_UNUSED(entity);
return 0;
}
bool CInfoDataReader::hasChangedUrl(CEntityFlags::Entity entity) const
{
// not implemented

3
src/blackcore/db/infodatareader.h
View File

@@ -61,7 +61,8 @@ namespace BlackCore
//! @{
virtual void syncronizeCaches(BlackMisc::Network::CEntityFlags::Entity entities) override;
virtual void invalidateCaches(BlackMisc::Network::CEntityFlags::Entity entities) override;
virtual QDateTime getCacheTimestamp(BlackMisc::Network::CEntityFlags::Entity entity) override;
virtual QDateTime getCacheTimestamp(BlackMisc::Network::CEntityFlags::Entity entity) const override;
virtual int getCacheCount(BlackMisc::Network::CEntityFlags::Entity entity) const override;
virtual bool hasChangedUrl(BlackMisc::Network::CEntityFlags::Entity entity) const override;
//! @}

8
src/blackcore/db/modeldatareader.cpp
View File

@@ -437,12 +437,18 @@ namespace BlackCore
Q_UNUSED(entities);
}
QDateTime CModelDataReader::getCacheTimestamp(CEntityFlags::Entity entity)
QDateTime CModelDataReader::getCacheTimestamp(CEntityFlags::Entity entity) const
{
Q_UNUSED(entity);
return QDateTime();
}
int CModelDataReader::getCacheCount(CEntityFlags::Entity entity) const
{
Q_UNUSED(entity);
return 0;
}
bool CModelDataReader::hasChangedUrl(CEntityFlags::Entity entity) const
{
Q_UNUSED(entity);

3
src/blackcore/db/modeldatareader.h
View File

@@ -128,7 +128,8 @@ namespace BlackCore
//! @{
virtual void syncronizeCaches(BlackMisc::Network::CEntityFlags::Entity entities) override;
virtual void invalidateCaches(BlackMisc::Network::CEntityFlags::Entity entities) override;
virtual QDateTime getCacheTimestamp(BlackMisc::Network::CEntityFlags::Entity entity) override;
virtual QDateTime getCacheTimestamp(BlackMisc::Network::CEntityFlags::Entity entity) const override;
virtual int getCacheCount(BlackMisc::Network::CEntityFlags::Entity entity) const override;
virtual bool hasChangedUrl(BlackMisc::Network::CEntityFlags::Entity entity) const override;
//! @}

2
src/blackcore/simulatorcommon.h
View File

@@ -133,7 +133,7 @@ namespace BlackCore
//! \todo unclear if this is valid for all simulators or for MS/P3D simulators only
BlackCore::CAircraftMatcher m_modelMatcher; //!< Model matcher
BlackMisc::Simulation::CAircraftModelSetLoader m_modelSetLoader { BlackMisc::Simulation::CSimulatorInfo(BlackMisc::Simulation::CSimulatorInfo::FSX), this }; //!< load model set from caches
BlackMisc::Simulation::CAircraftModelSetLoader m_modelSetLoader { this }; //!< load model set from caches
private:
bool m_debugMessages = false; //!< Display debug messages