commit 37b84c59c28a25fa51a633b23165f841e2946c19
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Fri Apr 26 13:38:52 2013 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Fri Apr 26 13:45:50 2013 -0700
tree f35e58ec68059c01e36fdbc4249f0b8d00fab6d7
parent 4cd50e33dd2b4e096c1c3c66a084ceb76aefd509

model+tracers: Implementing ability to trace satisfied/timed out interests

Implementing satsified/timed out interest tracing in L3AggregateTracer and L3RateTracer (only numbers)

utils/tracers/ndn-l3-tracer.cc

diff --git a/utils/tracers/ndn-l3-tracer.cc b/utils/tracers/ndn-l3-tracer.cc
index 847de2a..455f684 100644
--- a/utils/tracers/ndn-l3-tracer.cc
+++ b/utils/tracers/ndn-l3-tracer.cc
@@ -30,12 +30,13 @@
 #include "ns3/ndn-face.h"
 #include "ns3/ndn-interest.h"
 #include "ns3/ndn-content-object.h"
+#include "ns3/ndn-pit-entry.h"
 
 using namespace std;
 
 namespace ns3 {
 namespace ndn {
-    
+
 L3Tracer::L3Tracer (Ptr<Node> node)
 : m_nodePtr (node)
 {
@@ -85,6 +86,12 @@
                    MakeCallback (&L3Tracer::InNacks, this));
   Config::Connect ("/NodeList/"+m_node+"/$ns3::ndn::ForwardingStrategy/DropNacks",
                    MakeCallback (&L3Tracer::DropNacks, this));
+
+  // satisfied/timed out PIs
+  Config::ConnectWithoutContext ("/NodeList/"+m_node+"/$ns3::ndn::ForwardingStrategy/SatisfiedInterests",
+                                 MakeCallback (&L3Tracer::SatisfiedInterests, this));
+  Config::ConnectWithoutContext ("/NodeList/"+m_node+"/$ns3::ndn::ForwardingStrategy/TimedOutInterests",
+                                 MakeCallback (&L3Tracer::TimedOutInterests, this));
 }
 
 } // namespace ndn