commit 3476edf14e9910c0b1614d6f15402f3a58f4a2e0
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Tue Aug 14 11:26:00 2012 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Tue Sep 04 00:00:25 2012 -0700
tree 188641479029e5871ad92fe8d0ba25607358812a
parent 8067ff1e1032fca82d8c90d968a76f0d19ebd2e1

A slightly modified FwPerFibLimits test. Modified ConsumerBatches

apps/ndn-consumer-batches.cc

diff --git a/apps/ndn-consumer-batches.cc b/apps/ndn-consumer-batches.cc
index c4e93fb..398ec02 100644
--- a/apps/ndn-consumer-batches.cc
+++ b/apps/ndn-consumer-batches.cc
@@ -55,6 +55,7 @@
 }
 
 ConsumerBatches::ConsumerBatches ()
+  : m_initial (true)
 {
 }
 
@@ -74,6 +75,7 @@
   // std::cout << Simulator::Now () << " adding batch of " << amount << "\n";
   m_seqMax += amount;
   m_rtt->ClearSent (); // this is important, otherwise RTT estimation for the new batch will be affected by previous batch history
+  m_initial = true;
   ScheduleNextPacket ();
 }
 
@@ -81,7 +83,13 @@
 ConsumerBatches::ScheduleNextPacket ()
 {
   if (!m_sendEvent.IsRunning ())
-    m_sendEvent = Simulator::Schedule (Seconds (m_rtt->RetransmitTimeout ().ToDouble (Time::S)), &Consumer::SendPacket, this);
+    {
+      Time delay = Seconds (0);
+      if (!m_initial) delay = m_rtt->RetransmitTimeout ();
+      
+      m_initial = false;
+      m_sendEvent = Simulator::Schedule (delay, &Consumer::SendPacket, this);
+    }
 }
 
 ///////////////////////////////////////////////////