catchunks: use ndn-cxx's RttEstimator
Refs: #4887
Change-Id: If24bea40a22909bf0fd9e49ec7b18330dbe336f2
diff --git a/tools/chunks/catchunks/pipeline-interests-adaptive.hpp b/tools/chunks/catchunks/pipeline-interests-adaptive.hpp
index 0c4f889..8ecc45b 100644
--- a/tools/chunks/catchunks/pipeline-interests-adaptive.hpp
+++ b/tools/chunks/catchunks/pipeline-interests-adaptive.hpp
@@ -30,15 +30,18 @@
#define NDN_TOOLS_CHUNKS_CATCHUNKS_PIPELINE_INTERESTS_ADAPTIVE_HPP
#include "options.hpp"
-#include "rtt-estimator.hpp"
#include "pipeline-interests.hpp"
+#include <ndn-cxx/util/rtt-estimator.hpp>
+
#include <queue>
#include <unordered_map>
namespace ndn {
namespace chunks {
+using util::RttEstimator;
+
class PipelineInterestsAdaptiveOptions : public Options
{
public:
@@ -81,7 +84,7 @@
{
ScopedPendingInterestHandle interestHdl;
time::steady_clock::TimePoint timeSent;
- Milliseconds rto;
+ RttEstimator::MillisecondsDouble rto;
SegmentState state;
};
@@ -116,10 +119,10 @@
/**
* @brief Signals when the congestion window changes.
*
- * The callback function should be: void(Milliseconds age, double cwnd) where age is the
- * duration since pipeline starts, and cwnd is the new congestion window size (in segments).
+ * The callback function should be: `void(nanoseconds age, double cwnd)`, where `age` is the
+ * time since the pipeline started and `cwnd` is the new congestion window size (in segments).
*/
- signal::Signal<PipelineInterestsAdaptive, Milliseconds, double> afterCwndChange;
+ signal::Signal<PipelineInterestsAdaptive, time::nanoseconds, double> afterCwndChange;
protected:
DECLARE_SIGNAL_EMIT(afterCwndChange)