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

refactor: Remove hardcoded delays

Browse Source
This commit is contained in:
Lars Toenning
2025-06-09 13:16:11 +02:00
parent aac5339adc
commit 951ae0c9fe
2 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/core/webdataservices.cpp
View File

@@ -90,13 +90,7 @@ namespace swift::core
// trigger reading // trigger reading
// but do not start all at the same time // but do not start all at the same time
const CEntityFlags::Entity icaoPart = entities & CEntityFlags::AllIcaoCountriesCategory; this->readDeferredInBackground(entities);
const CEntityFlags::Entity modelPart = entities & CEntityFlags::DistributorLiveryModel;
CEntityFlags::Entity remainingEntities = entities & ~icaoPart;
remainingEntities &= ~modelPart;
this->readDeferredInBackground(icaoPart, 500);
this->readDeferredInBackground(modelPart, 1000);
this->readDeferredInBackground(remainingEntities, 1500);
} }
CWebDataServices::~CWebDataServices() { this->gracefulShutdown(); } CWebDataServices::~CWebDataServices() { this->gracefulShutdown(); }
@@ -1280,7 +1274,7 @@ namespace swift::core
// and trigger read // and trigger read
const QPointer<CWebDataServices> myself(this); const QPointer<CWebDataServices> myself(this);
QTimer::singleShot(25, m_sharedInfoDataReader, [=]() { QTimer::singleShot(0, m_sharedInfoDataReader, [=]() {
if (!myself || m_shuttingDown) { return; } if (!myself || m_shuttingDown) { return; }
m_sharedInfoDataReader->readInfoData(); m_sharedInfoDataReader->readInfoData();
}); });
@@ -1438,12 +1432,12 @@ namespace swift::core
} }
} }
void CWebDataServices::readDeferredInBackground(CEntityFlags::Entity entities, int delayMs) void CWebDataServices::readDeferredInBackground(CEntityFlags::Entity entities)
{ {
if (m_shuttingDown) { return; } if (m_shuttingDown) { return; }
if (entities == CEntityFlags::NoEntity) { return; } if (entities == CEntityFlags::NoEntity) { return; }
const QPointer<CWebDataServices> myself(this); const QPointer<CWebDataServices> myself(this);
QTimer::singleShot(delayMs, [=]() // clazy:exclude=connect-3arg-lambda QTimer::singleShot(0, [=]() // clazy:exclude=connect-3arg-lambda
{ {
if (!myself || m_shuttingDown) { return; } if (!myself || m_shuttingDown) { return; }
this->readInBackground(entities); // deferred this->readInBackground(entities); // deferred
@@ -1526,7 +1520,6 @@ namespace swift::core
// this will called for each entity readers, i.e. model reader, ICAO reader ... // this will called for each entity readers, i.e. model reader, ICAO reader ...
Q_ASSERT_X(infoReader, Q_FUNC_INFO, "Need info data reader"); Q_ASSERT_X(infoReader, Q_FUNC_INFO, "Need info data reader");
const int waitForInfoObjectsMs = 1000; // ms
if (infoReader->areAllInfoObjectsRead()) if (infoReader->areAllInfoObjectsRead())
{ {
@@ -1560,7 +1553,7 @@ namespace swift::core
if (infoReader->hasReceivedOkReply()) if (infoReader->hasReceivedOkReply())
{ {
// ok, this means we are parsing // ok, this means we are parsing
this->readDeferredInBackground(entities, waitForInfoObjectsMs); this->readDeferredInBackground(entities);
const CStatusMessage m = CLogMessage(this).info(u"Parsing objects (%1) for '%2' from '%3'") const CStatusMessage m = CLogMessage(this).info(u"Parsing objects (%1) for '%2' from '%3'")
<< info << CEntityFlags::entitiesToString(entities) << info << CEntityFlags::entitiesToString(entities)
<< infoReader->getInfoObjectsUrl().toQString(); << infoReader->getInfoObjectsUrl().toQString();
@@ -1584,7 +1577,7 @@ namespace swift::core
{ {
// wait for 1st reply // wait for 1st reply
// we call read again in some time // we call read again in some time
this->readDeferredInBackground(entities, waitForInfoObjectsMs); this->readDeferredInBackground(entities);
return false; // wait return false; // wait
} }
} }

2
src/core/webdataservices.h
View File

@@ -566,7 +566,7 @@ namespace swift::core
public slots: public slots:
//! Call CWebDataServices::readInBackground by single shot //! Call CWebDataServices::readInBackground by single shot
void readDeferredInBackground(swift::misc::network::CEntityFlags::Entity entities, int delayMs); void readDeferredInBackground(swift::misc::network::CEntityFlags::Entity entities);
//! First read (allows to immediately read in background) //! First read (allows to immediately read in background)
//! \remark ensures info objects (if and only if needed) are read upfront //! \remark ensures info objects (if and only if needed) are read upfront