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

Better consolidation message

Browse Source
This commit is contained in:
Klaus Basan
2018-08-20 19:43:51 +02:00
parent fcbca7b0b0
commit b4946bc46d
3 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,6 +16,7 @@
#include "blackmisc/threadutils.h" #include "blackmisc/threadutils.h"
#include "blackmisc/eventloop.h" #include "blackmisc/eventloop.h"
#include "blackmisc/logmessage.h" #include "blackmisc/logmessage.h"
#include <QTime>
using namespace BlackMisc; using namespace BlackMisc;
using namespace BlackMisc::Network; using namespace BlackMisc::Network;
@@ -115,7 +116,8 @@ namespace BlackCore
const QDateTime dbModelsLatestSync = m_syncedModelsLatestChange.value(modelCaches.getDescription()); const QDateTime dbModelsLatestSync = m_syncedModelsLatestChange.value(modelCaches.getDescription());
if (dbModelsLatestSync.isValid() && latestDbModelsTs <= dbModelsLatestSync) { return; } if (dbModelsLatestSync.isValid() && latestDbModelsTs <= dbModelsLatestSync) { return; }
m_syncedModelsLatestChange[modelCaches.getDescription()] = latestDbModelsTs; const QString description = modelCaches.getDescription();
m_syncedModelsLatestChange[description] = latestDbModelsTs;
const CSimulatorInfo simulators = modelCaches.simulatorsWithInitializedCache(); // simulators ever used const CSimulatorInfo simulators = modelCaches.simulatorsWithInitializedCache(); // simulators ever used
if (simulators.isNoSimulator()) { return; } if (simulators.isNoSimulator()) { return; }
@@ -124,11 +126,13 @@ namespace BlackCore
dbModelsConsidered; dbModelsConsidered;
if (dbModels.isEmpty()) { return; } if (dbModels.isEmpty()) { return; }
const QSet<CSimulatorInfo> simulatorsSet = simulators.asSingleSimulatorSet(); const QSet<CSimulatorInfo> simulatorsSet = simulators.asSingleSimulatorSet();
QTime time;
for (const CSimulatorInfo &singleSimulator : simulatorsSet) for (const CSimulatorInfo &singleSimulator : simulatorsSet)
{ {
if (!this->doWorkCheck()) { return; } if (!this->doWorkCheck()) { return; }
CAircraftModelList simulatorModels = modelCaches.getSynchronizedCachedModels(singleSimulator); CAircraftModelList simulatorModels = modelCaches.getSynchronizedCachedModels(singleSimulator);
if (simulatorModels.isEmpty()) { continue; } if (simulatorModels.isEmpty()) { continue; }
time.restart();
const CAircraftModelList dbModelsForSimulator = dbModels.matchesSimulator(singleSimulator); const CAircraftModelList dbModelsForSimulator = dbModels.matchesSimulator(singleSimulator);
if (dbModelsForSimulator.isEmpty()) { continue; } if (dbModelsForSimulator.isEmpty()) { continue; }
@@ -136,8 +140,9 @@ namespace BlackCore
const int c = CDatabaseUtils::consolidateModelsWithDbData(dbModelsForSimulator, simulatorModels, true); const int c = CDatabaseUtils::consolidateModelsWithDbData(dbModelsForSimulator, simulatorModels, true);
if (c > 0) if (c > 0)
{ {
this->addHistory(CLogMessage(this).info("Consolidated %1 models for '%2'") << c << singleSimulator.convertToQString());
const CStatusMessage m = modelCaches.setCachedModels(simulatorModels, singleSimulator); const CStatusMessage m = modelCaches.setCachedModels(simulatorModels, singleSimulator);
const int msElapsed = time.elapsed();
this->addHistory(CLogMessage(this).info("Consolidated %1 models (%2) for '%3' in %4ms") << c << description << singleSimulator.convertToQString() << msElapsed);
CLogMessage::preformatted(m); CLogMessage::preformatted(m);
this->addHistory(m); this->addHistory(m);
} }
@@ -168,11 +173,11 @@ namespace BlackCore
if (!latestDbTs.isValid()) { return; } if (!latestDbTs.isValid()) { return; }
if (latestDbTs <= latestCacheTs) if (latestDbTs <= latestCacheTs)
{ {
this->addHistory(CLogMessage(this).info("No auto sync with DB, entity '%1', DB ts: %2 cache ts: %3") << entityStr << latestDbTs.toString(Qt::ISODate) << latestCacheTsStr); this->addHistory(CLogMessage(this).info("Background updater, no auto sync with DB, entity '%1', DB ts: %2 cache ts: %3") << entityStr << latestDbTs.toString(Qt::ISODate) << latestCacheTsStr);
return; return;
} }
this->addHistory(CLogMessage(this).info("Triggering read of '%1' since '%2'") << entityStr << latestCacheTsStr); this->addHistory(CLogMessage(this).info("Background updater triggering read of '%1' since '%2'") << entityStr << latestCacheTsStr);
sApp->getWebDataServices()->triggerLoadingDirectlyFromDb(entity, latestCacheTs); sApp->getWebDataServices()->triggerLoadingDirectlyFromDb(entity, latestCacheTs);
} }

2
src/blackcore/db/databaseutils.cpp
View File

@@ -200,7 +200,7 @@ namespace BlackCore
if (processEvents && c % 125 == 0) { sApp->processEventsFor(25); } if (processEvents && c % 125 == 0) { sApp->processEventsFor(25); }
} }
} }
CLogMessage(static_cast<CDatabaseUtils *>(nullptr)).info("Consolidated %1 models in %2 ms") << models.size() << timer.elapsed(); CLogMessage(static_cast<CDatabaseUtils *>(nullptr)).info("Consolidated %1 models in %2ms") << models.size() << timer.elapsed();
return c; return c;
} }

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

@@ -391,7 +391,8 @@ namespace BlackCore
QTime time; QTime time;
time.start(); time.start();
models = CAircraftModelList::fromDatabaseJson(res); models = CAircraftModelList::fromDatabaseJson(res);
CLogMessage(this).info("Parsed %1 models in %2 ms") << models.size() << time.elapsed(); const int elapsed = time.elapsed();
CLogMessage(this).info("Parsed %1 models in %2 ms") << models.size() << elapsed;
} }
// synchronized update // synchronized update
@@ -419,7 +420,7 @@ namespace BlackCore
} }
whatToRead &= CEntityFlags::DistributorLiveryModel; // supported whatToRead &= CEntityFlags::DistributorLiveryModel; // supported
BlackMisc::Network::CEntityFlags::Entity reallyRead = CEntityFlags::NoEntity; CEntityFlags::Entity reallyRead = CEntityFlags::NoEntity;
CStatusMessageList msgs; CStatusMessageList msgs;
if (whatToRead.testFlag(CEntityFlags::LiveryEntity)) if (whatToRead.testFlag(CEntityFlags::LiveryEntity))