commit fc8425cb4bf4444b62bd90673d3cf08cd534669c
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Thu Jan 31 13:33:49 2013 -0800
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Thu Jan 31 13:41:56 2013 -0800
tree 0e3f8e9ae512d8828c5a207baa4bd1c62f52521a
parent 3a3ce1ada0b68a09c4855e9631f144d16d1a23c4

utils: Porting several new IPv4 tracers from the old code. Extending ndn-app-delay-tracer

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 3893d33..d659247 100644
--- a/utils/tracers/ndn-app-delay-tracer.cc
+++ b/utils/tracers/ndn-app-delay-tracer.cc
@@ -50,7 +50,7 @@
 {
   using namespace boost;
   using namespace std;
-  
+
   std::list<Ptr<AppDelayTracer> > tracers;
   boost::shared_ptr<std::ofstream> outputStream = make_shared<std::ofstream> ();
 
@@ -122,7 +122,8 @@
 void
 AppDelayTracer::PrintHeader (std::ostream &os) const
 {
-  os << "Node" << "\t"
+  os << "Time" << "\t"
+     << "Node" << "\t"
      << "AppId" << "\t"
      << "SeqNo" << "\t"
 
@@ -133,10 +134,11 @@
      << "HopCount"  << "";
 }
 
-void 
+void
 AppDelayTracer::LastRetransmittedInterestDataDelay (Ptr<App> app, uint32_t seqno, Time delay, int32_t hopCount)
 {
-  *m_os << m_node << "\t"
+  *m_os << Simulator::Now ().ToDouble (Time::S) << "\t"
+        << m_node << "\t"
         << app->GetId () << "\t"
         << seqno << "\t"
         << "LastDelay" << "\t"
@@ -145,11 +147,12 @@
         << 1 << "\t"
         << hopCount << "\n";
 }
-  
-void 
+
+void
 AppDelayTracer::FirstInterestDataDelay (Ptr<App> app, uint32_t seqno, Time delay, uint32_t retxCount, int32_t hopCount)
 {
-  *m_os << m_node << "\t"
+  *m_os << Simulator::Now ().ToDouble (Time::S) << "\t"
+        << m_node << "\t"
         << app->GetId () << "\t"
         << seqno << "\t"
         << "FullDelay" << "\t"