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

apps/ndn-consumer.h

diff --git a/apps/ndn-consumer.h b/apps/ndn-consumer.h
index 7fd8877..03c3dd9 100644
--- a/apps/ndn-consumer.h
+++ b/apps/ndn-consumer.h
@@ -31,6 +31,7 @@
 //#include "ns3/internet-module.h"
 
 #include <set>
+#include <map>
 
 #include <boost/multi_index_container.hpp>
 #include <boost/multi_index/tag.hpp>
@@ -175,11 +176,14 @@
     > { } ;
 
   SeqTimeoutsContainer m_seqTimeouts;       ///< \brief multi-index for the set of SeqTimeout structs
-  SeqTimeoutsContainer m_seqLifetimes;
+
+  SeqTimeoutsContainer m_seqLastDelay;
+  SeqTimeoutsContainer m_seqFullDelay;
+  std::map<uint32_t, uint32_t> m_seqRetxCounts;
   
   TracedCallback<Ptr<Node>, Ptr<Node>, uint32_t, uint32_t > m_pathWeightsTrace;
   TracedCallback<Ptr<App> /* app */, uint32_t /* seqno */, Time /* delay */> m_lastRetransmittedInterestDataDelay;
-  TracedCallback<Ptr<App> /* app */, uint32_t /* seqno */, Time /* delay */> m_firstInterestDataDelay;
+  TracedCallback<Ptr<App> /* app */, uint32_t /* seqno */, Time /* delay */, uint32_t /*retx count*/> m_firstInterestDataDelay;
   
 /// @endcond
 };