commit 359bfb73dbe27e44e3e2cb3ef728bbc5dbee7bd5
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Mon Jan 09 18:42:50 2012 -0800
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Mon Jan 09 18:42:50 2012 -0800
tree a985cbeb76c426574102e6c325176e0d0acd5dcd
parent 029d38dae6b34b7e2a913a6490027067f1243bd3

Implementing window-based CCNx consumer.  Adding RTO estimation.

- ContentObject increases window by 1
- NACK decreases window by 1
- TO doesn't change window

If window is zero, next packet is scheduled after 0.1*RTO

examples/congestion-pop.cc

diff --git a/examples/congestion-pop.cc b/examples/congestion-pop.cc
index 18cb26c..aed4aa9 100644
--- a/examples/congestion-pop.cc
+++ b/examples/congestion-pop.cc
@@ -144,9 +144,9 @@
         Ptr<Node> node1 = Names::Find<Node> ("/sprint", lexical_cast<string> (node1_num));
         Ptr<Node> node2 = Names::Find<Node> ("/sprint", lexical_cast<string> (node2_num));
 
-        CcnxAppHelper consumerHelper ("ns3::CcnxConsumerCbr");
+        CcnxAppHelper consumerHelper ("ns3::CcnxConsumerWindow");
         consumerHelper.SetPrefix ("/" + lexical_cast<string> (node2->GetId ()));
-        consumerHelper.SetAttribute ("MeanRate", StringValue ("2Mbps"));
+        // consumerHelper.SetAttribute ("MeanRate", StringValue ("2Mbps"));
         consumerHelper.SetAttribute ("Size", StringValue ("1.983642578125")); //to make sure max seq # is 2000
 
         CcnxAppHelper producerHelper ("ns3::CcnxProducer");
@@ -169,7 +169,7 @@
   {
     cout << "Run Simulation.\n";
     Simulator::Stop (finishTime);
-    // Simulator::Schedule (Seconds (1.0), PrintTime);
+    Simulator::Schedule (Seconds (1.0), PrintTime);
     Simulator::Run ();
     Simulator::Destroy ();
     cout << "Done.\n";
@@ -186,7 +186,7 @@
   cout << "Begin congestion-pop scenario\n";
   
   Config::SetDefault ("ns3::PointToPointNetDevice::DataRate", StringValue ("1Mbps"));
-  Config::SetDefault ("ns3::DropTailQueue::MaxPackets", StringValue ("20"));
+  Config::SetDefault ("ns3::DropTailQueue::MaxPackets", StringValue ("60"));
 
   uint32_t maxRuns = 1;
   uint32_t startRun = 0;
@@ -212,6 +212,9 @@
       ofstream of_nodes ((prefix + "apps.log").c_str ());
       for (uint32_t i = 0; i < apps.GetN () / 2; i++) 
         {
+          apps.Get (i*2)->SetStartTime (Seconds (i));
+          apps.Get (i*2 + 1)->SetStartTime (Seconds (i));
+          
           of_nodes << "From " << apps.Get (i*2)->GetNode ()->GetId ()
                    << " to "  << apps.Get (i*2 + 1)->GetNode ()->GetId ();
           of_nodes << "\n";
@@ -220,7 +223,8 @@
 
       CcnxTraceHelper traceHelper;
       traceHelper.EnableRateL3All (prefix + "rate-trace.log");
-      traceHelper.EnableSeqsAppAll ("ns3::CcnxConsumer", prefix + "consumers-seqs.log");
+      // traceHelper.EnableSeqsAppAll ("ns3::CcnxConsumerCbr", prefix + "consumers-seqs.log");
+      traceHelper.EnableSeqsAppAll ("ns3::CcnxConsumerWindow", prefix + "consumers-seqs.log");
 
       experiment.Run (Seconds (200.0));
     }