flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-31 12:55:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Streamlined readInBackground as result of #709

Browse Source
This commit is contained in:
Klaus Basan
2016-07-18 18:54:52 +02:00
parent 435f345cc6
commit 8278fb262e
2 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/blackcore/webdataservices.cpp
View File

@@ -83,7 +83,7 @@ namespace BlackCore
entities &= ~CEntityFlags::InfoObjectEntity; // triggered in init readers
entities &= ~CEntityFlags::VatsimStatusFile; // triggered in init readers
entities &= ~this->m_entitiesPeriodicallyRead; // will be triggered by timers
this->singleShotReadInBackground(entities, 1000);
this->readDeferredInBackground(entities, 1000);
}
CServerList CWebDataServices::getVatsimFsdServers() const
@@ -691,15 +691,15 @@ namespace BlackCore
// void
}
void CWebDataServices::singleShotReadInBackground(CEntityFlags::Entity entities, int delayMs)
void CWebDataServices::readDeferredInBackground(CEntityFlags::Entity entities, int delayMs)
{
QTimer::singleShot(delayMs, [ = ]()
{
this->readInBackground(entities, delayMs);
this->readInBackground(entities);
});
}
void CWebDataServices::readInBackground(CEntityFlags::Entity entities, int delayMs)
void CWebDataServices::readInBackground(CEntityFlags::Entity entities)
{
m_initialRead = true; // read started
@@ -713,40 +713,41 @@ namespace BlackCore
// try to read
if (this->m_infoObjectTrials > maxWaitCycles)
{
CLogMessage(this).error("Cannot read info objects from %1") << this->m_infoDataReader->getInfoObjectsUrl().toQString();
CLogMessage(this).error("Cannot read info objects for %1 from %2")
<< CEntityFlags::flagToString(entities)
<< this->m_infoDataReader->getInfoObjectsUrl().toQString();
// continue here and read data
}
else if (this->m_infoDataReader->canConnect())
{
// read, but no idea if succesful/failure
if (this->m_infoDataReader->getDbInfoObjectCount() > 0)
if (this->m_infoDataReader->areAllDataRead())
{
CLogMessage(this).info("Info objects loaded from %1") << this->m_infoDataReader->getInfoObjectsUrl().toQString();
CLogMessage(this).info("Info objects for %1 loaded from %2")
<< CEntityFlags::flagToString(entities)
<< this->m_infoDataReader->getInfoObjectsUrl().toQString();
// continue here and read data
}
else
{
CLogMessage(this).error("Info objects loading failed from %1, '%2'")
CLogMessage(this).error("Info objects loading for %1 failed from %2, '%3'")
<< CEntityFlags::flagToString(entities)
<< this->m_infoDataReader->getInfoObjectsUrl().toQString()
<< this->m_infoDataReader->getStatusMessage();
this->readDeferredInBackground(entities, waitForInfoObjects);
return;
}
}
else
{
// postpone by some time
// can not connect right now, postpone and try again
this->m_infoObjectTrials++;
this->singleShotReadInBackground(entities, waitForInfoObjects);
this->readDeferredInBackground(entities, waitForInfoObjects);
return;
}
}
// read entities
if (delayMs > 100)
{
this->singleShotReadInBackground(entities, delayMs);
}
else
{
this->triggerRead(entities);
}
this->triggerRead(entities);
}
bool CWebDataServices::writeDbDataToDisk(const QString &dir) const

8
src/blackcore/webdataservices.h
View File

@@ -321,8 +321,11 @@ namespace BlackCore
void dataRead(BlackMisc::Network::CEntityFlags::Entity entity, BlackMisc::Network::CEntityFlags::ReadState state, int number);
public slots:
//! Call CWebDataServices::readInBackground by single shot
void readDeferredInBackground(BlackMisc::Network::CEntityFlags::Entity entities, int delayMs);
//! First read (allows to immediately read in background)
void readInBackground(BlackMisc::Network::CEntityFlags::Entity entities = BlackMisc::Network::CEntityFlags::AllEntities, int delayMs = 0);
void readInBackground(BlackMisc::Network::CEntityFlags::Entity entities = BlackMisc::Network::CEntityFlags::AllEntities);
private slots:
//! ATC bookings received
@@ -350,9 +353,6 @@ namespace BlackCore
//! Init the writers
void initWriters();
//! Call CWebDataServices::readInBackground by single shot
void singleShotReadInBackground(BlackMisc::Network::CEntityFlags::Entity entities, int delayMs);
CWebReaderFlags::WebReader m_readers = CWebReaderFlags::WebReaderFlag::None; //!< which readers are available
BlackCore::Db::CDatabaseReaderConfigList m_dbReaderConfig; //!< how to read DB data
BlackMisc::Network::CEntityFlags::Entity m_entitiesPeriodicallyRead = BlackMisc::Network::CEntityFlags::NoEntity; //!< those entities which are permanently updated by timers