commit 400aae1ed9348c37f7405486d89034077dd142d3
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Sat Jan 19 13:27:52 2013 -0800
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Sat Jan 19 13:27:52 2013 -0800
tree c6c1b834766779bafc9331824851656e55ff902f
parent 29dfb981568a1755955902c9176a6efa199138d0

apps+utils: Correcting Interest-Delay tracing

utils/tracers/ndn-app-delay-tracer.cc

diff --git a/utils/tracers/ndn-app-delay-tracer.cc b/utils/tracers/ndn-app-delay-tracer.cc
index 6ed3e87..b02b3ac 100644
--- a/utils/tracers/ndn-app-delay-tracer.cc
+++ b/utils/tracers/ndn-app-delay-tracer.cc
@@ -128,7 +128,8 @@
 
      << "Type" << "\t"
      << "DelayS" << "\t"
-     << "DelayUS" << "\n";
+     << "DelayUS" << "\t"
+     << "RetxCount" << "";
 }
 
 void 
@@ -139,18 +140,20 @@
         << seqno << "\t"
         << "LastDelay" << "\t"
         << delay.ToDouble (Time::S) << "\t"
-        << delay.ToDouble (Time::US) << "\n";
+        << delay.ToDouble (Time::US) << "\t"
+        << 1 << "\n";
 }
   
 void 
-AppDelayTracer::FirstInterestDataDelay (Ptr<App> app, uint32_t seqno, Time delay)
+AppDelayTracer::FirstInterestDataDelay (Ptr<App> app, uint32_t seqno, Time delay, uint32_t retxCount)
 {
   *m_os << m_node << "\t"
         << app->GetId () << "\t"
         << seqno << "\t"
         << "FullDelay" << "\t"
         << delay.ToDouble (Time::S) << "\t"
-        << delay.ToDouble (Time::US) << "\n";
+        << delay.ToDouble (Time::US) << "\t"
+        << retxCount << "\n";
 }
 
 

utils/tracers/ndn-app-delay-tracer.h

diff --git a/utils/tracers/ndn-app-delay-tracer.h b/utils/tracers/ndn-app-delay-tracer.h
index af0007f..ac586b2 100644
--- a/utils/tracers/ndn-app-delay-tracer.h
+++ b/utils/tracers/ndn-app-delay-tracer.h
@@ -94,7 +94,7 @@
   LastRetransmittedInterestDataDelay (Ptr<App> app, uint32_t seqno, Time delay);
   
   void 
-  FirstInterestDataDelay (Ptr<App> app, uint32_t seqno, Time delay);
+  FirstInterestDataDelay (Ptr<App> app, uint32_t seqno, Time delay, uint32_t rextCount);
   
 private:
   std::string m_node;