refs #667 Interpolator: relaxed thread safety requirements by removing the dependence on shared state.

src/blackmisc/interpolator.cpp

@@ -24,7 +24,30 @@ namespace BlackMisc
         this->setObjectName(objectName);
     }
 
-    CAircraftPartsList IInterpolator::getPartsBeforeTime(const CCallsign &callsign, qint64 cutoffTime, BlackMisc::IInterpolator::PartsStatus &partsStatus)
+    BlackMisc::Aviation::CAircraftSituation IInterpolator::getInterpolatedSituation(const BlackMisc::Aviation::CCallsign &callsign, qint64 currentTimeSinceEpoc,
+        bool isVtolAircraft, InterpolationStatus &status) const
+    {
+        // has to be thread safe
+
+        status.reset();
+        Q_ASSERT_X(!callsign.isEmpty(), Q_FUNC_INFO, "empty callsign");
+
+        auto currentSituation = this->getInterpolatedSituation(this->remoteAircraftSituations(callsign), currentTimeSinceEpoc, isVtolAircraft, status);
+
+        Q_ASSERT_X(currentSituation.getCallsign() == callsign, Q_FUNC_INFO, "mismatching callsigns");
+        return currentSituation;
+    }
+
+    CAircraftPartsList IInterpolator::getPartsBeforeTime(const CAircraftPartsList &parts, qint64 cutoffTime, BlackMisc::IInterpolator::PartsStatus &partsStatus) const
+    {
+        partsStatus.reset();
+        partsStatus.supportsParts = true;
+
+        if (cutoffTime < 0) { return parts; }
+        return parts.findBefore(cutoffTime);
+    }
+
+    CAircraftPartsList IInterpolator::getPartsBeforeTime(const CCallsign &callsign, qint64 cutoffTime, BlackMisc::IInterpolator::PartsStatus &partsStatus) const
     {
         Q_ASSERT_X(!callsign.isEmpty(), Q_FUNC_INFO, "empty callsign");
         partsStatus.reset();

src/blackmisc/interpolator.h

@@ -68,14 +68,26 @@ namespace BlackMisc
         //! Current interpolated situation
         //! \threadsafe
         virtual BlackMisc::Aviation::CAircraftSituation getInterpolatedSituation(
-            const BlackMisc::Aviation::CCallsign &callsign, qint64 currentTimeSinceEpoc,
+            const BlackMisc::Aviation::CAircraftSituationList &situations, qint64 currentTimeSinceEpoc,
             bool isVtolAircraft, InterpolationStatus &status) const = 0;
 
+        //! Current interpolated situation
+        //! \threadsafe
+        virtual BlackMisc::Aviation::CAircraftSituation getInterpolatedSituation(
+            const BlackMisc::Aviation::CCallsign &callsign, qint64 currentTimeSinceEpoc,
+            bool isVtolAircraft, InterpolationStatus &status) const;
+
+        //! Parts before given offset time (aka pending parts)
+        //! \threadsafe
+        virtual BlackMisc::Aviation::CAircraftPartsList getPartsBeforeTime(
+            const BlackMisc::Aviation::CAircraftPartsList &parts, qint64 cutoffTime,
+            PartsStatus &partsStatus) const;
+
         //! Parts before given offset time (aka pending parts)
         //! \threadsafe
         virtual BlackMisc::Aviation::CAircraftPartsList getPartsBeforeTime(
             const BlackMisc::Aviation::CCallsign &callsign, qint64 cutoffTime,
-            PartsStatus &partsStatus);
+            PartsStatus &partsStatus) const;
 
         //! Enable debug messages
         void enableDebugMessages(bool enabled);

src/blackmisc/interpolatorlinear.cpp

@@ -36,19 +36,17 @@ using namespace BlackMisc::Aviation;
 
 namespace BlackMisc
 {
-    CAircraftSituation CInterpolatorLinear::getInterpolatedSituation(const CCallsign &callsign, qint64 currentTimeMsSinceEpoc, bool vtolAiracraft, InterpolationStatus &status) const
+    CAircraftSituation CInterpolatorLinear::getInterpolatedSituation(const BlackMisc::Aviation::CAircraftSituationList &situations, qint64 currentTimeMsSinceEpoc, bool vtolAiracraft, InterpolationStatus &status) const
     {
         // has to be thread safe
 
         status.reset();
 
         // any data at all?
-        Q_ASSERT_X(!callsign.isEmpty(), Q_FUNC_INFO, "empty callsign");
+        if (situations.isEmpty()) { return {}; }
-        if (this->remoteAircraftSituationsCount(callsign) < 1) { return {}; }
 
         // data, split situations by time
         if (currentTimeMsSinceEpoc < 0) { currentTimeMsSinceEpoc = QDateTime::currentMSecsSinceEpoch(); }
-        const auto situations = remoteAircraftSituations(callsign);
 
         // find the first situation not in the correct order, keep only the situations before that one
         auto end = std::is_sorted_until(situations.begin(), situations.end(), [](auto &&a, auto &&b) { return b.getAdjustedMSecsSinceEpoch() < a.getAdjustedMSecsSinceEpoch(); });
@@ -110,7 +108,7 @@ namespace BlackMisc
         {
             if (this->m_withDebugMsg)
             {
-                CLogMessage(this).warning("Extrapolation, fraction > 1: %1 for callsign: %2") << simulationTimeFraction << callsign;
+                CLogMessage(this).warning("Extrapolation, fraction > 1: %1 for callsign: %2") << simulationTimeFraction << oldSituation.getCallsign();
             }
         }
 
@@ -182,7 +180,6 @@ namespace BlackMisc
                                         * simulationTimeFraction
                                         + oldSituation.getGroundSpeed());
         status.changedPosition = true;
-        Q_ASSERT_X(currentSituation.getCallsign() == callsign, Q_FUNC_INFO, "mismatching callsigns");
         return currentSituation;
     }
 

src/blackmisc/interpolatorlinear.h

@@ -36,7 +36,9 @@ namespace BlackMisc
         {}
 
         //! \copydoc IInterpolator::getInterpolatedSituation
-        virtual BlackMisc::Aviation::CAircraftSituation getInterpolatedSituation(const BlackMisc::Aviation::CCallsign &callsign, qint64 currentTimeSinceEpoc, bool vtolAiracraft, InterpolationStatus &status) const override;
+        virtual BlackMisc::Aviation::CAircraftSituation getInterpolatedSituation(const BlackMisc::Aviation::CAircraftSituationList &situations, qint64 currentTimeSinceEpoc, bool vtolAiracraft, InterpolationStatus &status) const override;
+
+        using IInterpolator::getInterpolatedSituation;
 
         //! Log category
         static QString getLogCategory() { return "swift.interpolatorlinear"; }