apps+model+utils: Implementing Interest/Data hop counting using new PacketTag
diff --git a/utils/tracers/ndn-app-delay-tracer.cc b/utils/tracers/ndn-app-delay-tracer.cc
index b02b3ac..3893d33 100644
--- a/utils/tracers/ndn-app-delay-tracer.cc
+++ b/utils/tracers/ndn-app-delay-tracer.cc
@@ -129,11 +129,12 @@
<< "Type" << "\t"
<< "DelayS" << "\t"
<< "DelayUS" << "\t"
- << "RetxCount" << "";
+ << "RetxCount" << "\t"
+ << "HopCount" << "";
}
void
-AppDelayTracer::LastRetransmittedInterestDataDelay (Ptr<App> app, uint32_t seqno, Time delay)
+AppDelayTracer::LastRetransmittedInterestDataDelay (Ptr<App> app, uint32_t seqno, Time delay, int32_t hopCount)
{
*m_os << m_node << "\t"
<< app->GetId () << "\t"
@@ -141,11 +142,12 @@
<< "LastDelay" << "\t"
<< delay.ToDouble (Time::S) << "\t"
<< delay.ToDouble (Time::US) << "\t"
- << 1 << "\n";
+ << 1 << "\t"
+ << hopCount << "\n";
}
void
-AppDelayTracer::FirstInterestDataDelay (Ptr<App> app, uint32_t seqno, Time delay, uint32_t retxCount)
+AppDelayTracer::FirstInterestDataDelay (Ptr<App> app, uint32_t seqno, Time delay, uint32_t retxCount, int32_t hopCount)
{
*m_os << m_node << "\t"
<< app->GetId () << "\t"
@@ -153,7 +155,8 @@
<< "FullDelay" << "\t"
<< delay.ToDouble (Time::S) << "\t"
<< delay.ToDouble (Time::US) << "\t"
- << retxCount << "\n";
+ << retxCount << "\t"
+ << hopCount << "\n";
}