catchunks: switch to RttEstimatorWithStats
Refs: #4887
Change-Id: I8d49eff6ff4a7dc9ff49ffacc0744e50695128d2
diff --git a/tools/chunks/catchunks/pipeline-interests-adaptive.cpp b/tools/chunks/catchunks/pipeline-interests-adaptive.cpp
index cde5e40..8ae2162 100644
--- a/tools/chunks/catchunks/pipeline-interests-adaptive.cpp
+++ b/tools/chunks/catchunks/pipeline-interests-adaptive.cpp
@@ -37,7 +37,8 @@
constexpr double PipelineInterestsAdaptive::MIN_SSTHRESH;
-PipelineInterestsAdaptive::PipelineInterestsAdaptive(Face& face, RttEstimator& rttEstimator,
+PipelineInterestsAdaptive::PipelineInterestsAdaptive(Face& face,
+ RttEstimatorWithStats& rttEstimator,
const Options& options)
: PipelineInterests(face)
, m_options(options)
@@ -285,7 +286,11 @@
m_retxCount.count(recvSegNo) == 0) {
auto nExpectedSamples = std::max<int64_t>((m_nInFlight + 1) >> 1, 1);
BOOST_ASSERT(nExpectedSamples > 0);
- m_rttEstimator.addMeasurement(rtt, static_cast<size_t>(nExpectedSamples), recvSegNo);
+ m_rttEstimator.addMeasurement(rtt, static_cast<size_t>(nExpectedSamples));
+ afterRttMeasurement({recvSegNo, rtt,
+ m_rttEstimator.getSmoothedRtt(),
+ m_rttEstimator.getRttVariation(),
+ m_rttEstimator.getEstimatedRto()});
}
// remove the entry associated with the received segment