commit 92d5be19e28bed5e4610bfb70e7a5a31f57067e7
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Mon Aug 13 18:56:52 2012 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Mon Sep 03 17:47:36 2012 -0700
tree 03209e471d11a56c5711f04b8c92a780fb2c60fa
parent 5b054aa64bf353237f2656f72cbdedb7426be75f

Regression: RTO in Consumers was not exponentially increased

apps/ndn-consumer-batches.cc

diff --git a/apps/ndn-consumer-batches.cc b/apps/ndn-consumer-batches.cc
index e66b741..c4e93fb 100644
--- a/apps/ndn-consumer-batches.cc
+++ b/apps/ndn-consumer-batches.cc
@@ -81,7 +81,7 @@
 ConsumerBatches::ScheduleNextPacket ()
 {
   if (!m_sendEvent.IsRunning ())
-    m_sendEvent = Simulator::Schedule (Seconds (m_rtt->RetransmitTimeout ().ToDouble (Time::S) * 0.1), &Consumer::SendPacket, this);
+    m_sendEvent = Simulator::Schedule (Seconds (m_rtt->RetransmitTimeout ().ToDouble (Time::S)), &Consumer::SendPacket, this);
 }
 
 ///////////////////////////////////////////////////

apps/ndn-consumer.cc

diff --git a/apps/ndn-consumer.cc b/apps/ndn-consumer.cc
index 80b410b..2c13925 100644
--- a/apps/ndn-consumer.cc
+++ b/apps/ndn-consumer.cc
@@ -319,16 +319,17 @@
   m_retxSeqs.insert (seq);
   NS_LOG_INFO ("After: " << m_retxSeqs.size ());
 
-  // m_rtt->IncreaseMultiplier ();             // Double the next RTO ??
+  m_rtt->IncreaseMultiplier ();             // Double the next RTO ??
   ScheduleNextPacket ();
 }
 
 void
 Consumer::OnTimeout (uint32_t sequenceNumber)
 {
+  NS_LOG_FUNCTION (sequenceNumber);
   // std::cout << Simulator::Now () << ", TO: " << sequenceNumber << ", current RTO: " << m_rtt->RetransmitTimeout ().ToDouble (Time::S) << "s\n";
 
-  // m_rtt->IncreaseMultiplier ();             // Double the next RTO
+  m_rtt->IncreaseMultiplier ();             // Double the next RTO
   m_rtt->SentSeq (SequenceNumber32 (sequenceNumber), 1); // make sure to disable RTT calculation for this sample
   m_retxSeqs.insert (sequenceNumber);
   ScheduleNextPacket ();