diff --git a/src/blackmisc/simulation/interpolationlogger.cpp b/src/blackmisc/simulation/interpolationlogger.cpp index 31161ce9d..b230d3986 100644 --- a/src/blackmisc/simulation/interpolationlogger.cpp +++ b/src/blackmisc/simulation/interpolationlogger.cpp @@ -47,17 +47,20 @@ namespace BlackMisc CWorker *CInterpolationLogger::writeLogInBackground() { - QList interpolation; + QList situations; QList parts; { - QReadLocker l(&m_lockLogs); - interpolation = m_situationLogs; + QReadLocker l(&m_lockSituations); + situations = m_situationLogs; + } + { + QReadLocker l(&m_lockParts); parts = m_partsLogs; } - CWorker *worker = CWorker::fromTask(this, "WriteInterpolationLog", [interpolation, parts]() + CWorker *worker = CWorker::fromTask(this, "WriteInterpolationLog", [situations, parts]() { - const CStatusMessageList msg = CInterpolationLogger::writeLogFile(interpolation, parts); + const CStatusMessageList msg = CInterpolationLogger::writeLogFile(situations, parts); CLogMessage::preformatted(msg); }); return worker; @@ -127,14 +130,88 @@ namespace BlackMisc void CInterpolationLogger::logInterpolation(const CInterpolationLogger::SituationLog &log) { - QWriteLocker l(&m_lockLogs); - m_situationLogs.append(log); + QWriteLocker l(&m_lockSituations); + m_situationLogs.push_back(log); + if (m_situationLogs.size() > m_maxSituations) + { + m_situationLogs.removeFirst(); + } } - void CInterpolationLogger::logParts(const CInterpolationLogger::PartsLog &parts) + void CInterpolationLogger::logParts(const CInterpolationLogger::PartsLog &log) { - QWriteLocker l(&m_lockLogs); - m_partsLogs.append(parts); + QWriteLocker l(&m_lockParts); + m_partsLogs.push_back(log); + } + + void CInterpolationLogger::setMaxSituations(int max) + { + QReadLocker l(&m_lockSituations); + m_maxSituations = max; + } + + QList CInterpolationLogger::getSituationsLog() const + { + QReadLocker l(&m_lockSituations); + return m_situationLogs; + } + + QList CInterpolationLogger::getPartsLog() const + { + QReadLocker l(&m_lockParts); + return m_partsLogs; + } + + QList CInterpolationLogger::getSituationsLog(const CCallsign &cs) const + { + const QList copy(this->getSituationsLog()); + QList logs; + for (const SituationLog &log : copy) + { + if (log.callsign != cs) { continue; } + logs.push_back(log); + } + return logs; + } + + QList CInterpolationLogger::getPartsLog(const CCallsign &cs) const + { + const QList copy(this->getPartsLog()); + QList logs; + for (const PartsLog &log : copy) + { + if (log.callsign != cs) { continue; } + logs.push_back(log); + } + return logs; + } + + CAircraftSituation CInterpolationLogger::getLastSituation() const + { + QReadLocker l(&m_lockSituations); + if (m_situationLogs.isEmpty()) { return CAircraftSituation(); } + return m_situationLogs.last().currentSituation; + } + + CAircraftSituation CInterpolationLogger::getLastSituation(const CCallsign &cs) const + { + const QList copy(this->getSituationsLog(cs)); + if (copy.isEmpty()) { return CAircraftSituation(); } + return copy.last().currentSituation; + } + + CAircraftParts CInterpolationLogger::getLastParts() const + { + QReadLocker l(&m_lockParts); + if (m_partsLogs.isEmpty()) { return CAircraftParts(); } + return m_partsLogs.last().parts; + } + + CAircraftParts CInterpolationLogger::getLastParts(const CCallsign &cs) const + { + const QList copy(this->getPartsLog(cs)); + if (copy.isEmpty()) { return CAircraftParts(); } + return copy.last().parts; } const QString &CInterpolationLogger::filePatternInterpolationLog() @@ -269,9 +346,14 @@ namespace BlackMisc void CInterpolationLogger::clearLog() { - QWriteLocker l(&m_lockLogs); - m_partsLogs.clear(); - m_situationLogs.clear(); + { + QWriteLocker l(&m_lockSituations); + m_situationLogs.clear(); + } + { + QWriteLocker l(&m_lockParts); + m_partsLogs.clear(); + } } QString CInterpolationLogger::msSinceEpochToTime(qint64 ms) diff --git a/src/blackmisc/simulation/interpolationlogger.h b/src/blackmisc/simulation/interpolationlogger.h index 1c37047e5..83ec49da5 100644 --- a/src/blackmisc/simulation/interpolationlogger.h +++ b/src/blackmisc/simulation/interpolationlogger.h @@ -87,7 +87,42 @@ namespace BlackMisc //! Log current parts cycle, only stores in memory, for performance reasons //! \remark const to allow const interpolator functions //! \threadsafe - void logParts(const PartsLog &parts); + void logParts(const PartsLog &log); + + //! Max.situations logged + void setMaxSituations(int max); + + //! All situation logs + //! \threadsafe + QList getSituationsLog() const; + + //! All parts logs + //! \threadsafe + QList getPartsLog() const; + + //! All situation logs for callsign + //! \threadsafe + QList getSituationsLog(const Aviation::CCallsign &cs) const; + + //! All parts logs for callsign + //! \threadsafe + QList getPartsLog(const Aviation::CCallsign &cs) const; + + //! Get last situation + //! \threadsafe + Aviation::CAircraftSituation getLastSituation() const; + + //! Get last situation + //! \threadsafe + Aviation::CAircraftSituation getLastSituation(const Aviation::CCallsign &cs) const; + + //! Get last parts + //! \threadsafe + Aviation::CAircraftParts getLastParts() const; + + //! Get last parts + //! \threadsafe + Aviation::CAircraftParts getLastParts(const Aviation::CCallsign &cs) const; //! File pattern for interpolation log static const QString &filePatternInterpolationLog(); @@ -100,13 +135,13 @@ namespace BlackMisc private: //! Get log as HTML table - static QString getHtmlInterpolationLog(const QList &logs); + static QString getHtmlInterpolationLog(const QList &getSituationsLog); //! Get log as HTML table - static QString getHtmlPartsLog(const QList &logs); + static QString getHtmlPartsLog(const QList &getSituationsLog); //! Write log to file - static CStatusMessageList writeLogFile(const QList &interpolation, const QList &parts); + static CStatusMessageList writeLogFile(const QList &interpolation, const QList &getPartsLog); //! Status of file operation static CStatusMessage logStatusFileWriting(bool success, const QString &fileName); @@ -117,9 +152,11 @@ namespace BlackMisc //! Create readable time static QString msSinceEpochToTime(qint64 t1, qint64 t2, qint64 t3 = -1); - mutable QReadWriteLock m_lockLogs; //!< lock logging - QList m_partsLogs; //!< logs of parts - QList m_situationLogs; //!< logs of interpolation + mutable QReadWriteLock m_lockSituations; //!< lock logging + mutable QReadWriteLock m_lockParts; //!< lock logging + int m_maxSituations = 2500; + QList m_partsLogs; //!< logs of parts + QList m_situationLogs; //!< logs of interpolation }; } // namespace } // namespace