commit 94cebd08679f9df32391c69b3f33ab229e7a097f
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Mon Jan 16 12:22:34 2012 -0800
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Mon Jan 16 12:22:34 2012 -0800
tree a528dbe36d9230fa3e2a72524b1979a47944ba6d
parent 2c069b9b4c995e03a7589301609f6921b12454ad

CcnxConsumerCbr now is really CBR (no randomization).

Several corrections in blackhole-sprint scenario.

apps/ccnx-consumer-cbr.cc

diff --git a/apps/ccnx-consumer-cbr.cc b/apps/ccnx-consumer-cbr.cc
index 5a2a759..b001ba7 100644
--- a/apps/ccnx-consumer-cbr.cc
+++ b/apps/ccnx-consumer-cbr.cc
@@ -97,12 +97,13 @@
 void
 CcnxConsumerCbr::ScheduleNextPacket ()
 {
-  // double mean = 8.0 * m_payloadSize / m_desiredRate.GetBitRate ();
+  double mean = 8.0 * m_payloadSize / m_desiredRate.GetBitRate ();
+  // std::cout << "next: " << Simulator::Now().ToDouble(Time::S) + mean << "s\n";
 
   if (!m_sendEvent.IsRunning ())
     m_sendEvent = Simulator::Schedule (
-                                       Seconds(m_randExp.GetValue ()),
-                                       // Seconds(mean),
+                                       // Seconds(m_randExp.GetValue ()),
+                                       Seconds(mean),
                                        &CcnxConsumer::SendPacket, this);
 }
 

apps/ccnx-consumer.cc

diff --git a/apps/ccnx-consumer.cc b/apps/ccnx-consumer.cc
index 6fc3a40..28dc23e 100644
--- a/apps/ccnx-consumer.cc
+++ b/apps/ccnx-consumer.cc
@@ -112,7 +112,7 @@
 {
   NS_LOG_FUNCTION_NOARGS ();
   
-  m_rtt = CreateObject<RttMeanDeviation> (); 
+  m_rtt = CreateObject<RttMeanDeviation> ();
 }
 
 void