commit 1a0fff6fc0ec2f14e75b2bc0c473c47c4bb03938
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Sat Jan 19 14:29:51 2013 -0800
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Sat Jan 19 14:29:51 2013 -0800
tree 18acf1a52842a477ef289548dc4b5afafabb23de
parent 400aae1ed9348c37f7405486d89034077dd142d3

apps+model+utils: Implementing Interest/Data hop counting using new PacketTag

examples/ndn-tree-app-delay-tracer.cc

diff --git a/examples/ndn-tree-app-delay-tracer.cc b/examples/ndn-tree-app-delay-tracer.cc
index 0b81c06..0fdffd9 100644
--- a/examples/ndn-tree-app-delay-tracer.cc
+++ b/examples/ndn-tree-app-delay-tracer.cc
@@ -84,18 +84,18 @@
   Ptr<Node> consumers[4] = { Names::Find<Node> ("leaf-1"), Names::Find<Node> ("leaf-2"),
                              Names::Find<Node> ("leaf-3"), Names::Find<Node> ("leaf-4") };
   Ptr<Node> producer = Names::Find<Node> ("root");
+  
+  ndn::AppHelper consumerHelper ("ns3::ndn::ConsumerBatches");
+  consumerHelper.SetPrefix ("/root");
+  consumerHelper.SetAttribute ("Batches", StringValue ("1s 1 10s 1"));
+  consumerHelper.Install (consumers[0]);
 
-  for (int i = 0; i < 4; i++)
-    {
-      ndn::AppHelper consumerHelper ("ns3::ndn::ConsumerCbr");
-      consumerHelper.SetAttribute ("Frequency", StringValue ("10")); // 100 interests a second
+  consumerHelper.SetAttribute ("Batches", StringValue ("11s 1")); 
+  consumerHelper.Install (consumers[1]);
+  
+  consumerHelper.SetAttribute ("Batches", StringValue ("11s 1")); 
+  consumerHelper.Install (consumers[2]);
 
-      // Each consumer will express the same data /root/<seq-no>
-      consumerHelper.SetPrefix ("/root");
-      ApplicationContainer app = consumerHelper.Install (consumers[i]);
-      app.Start (Seconds (0.01 * i));
-    }
-    
   ndn::AppHelper producerHelper ("ns3::ndn::Producer");
   producerHelper.SetAttribute ("PayloadSize", StringValue("1024"));  
 
@@ -103,7 +103,8 @@
   // install producer that will satisfy Interests in /root namespace
   ccnxGlobalRoutingHelper.AddOrigins ("/root", producer);
   producerHelper.SetPrefix ("/root");
-  producerHelper.Install (producer);
+  producerHelper.Install (producer)
+    .Start (Seconds (9));
 
   // Calculate and install FIBs
   ccnxGlobalRoutingHelper.CalculateRoutes ();