commit 462a56b90e8f464ecd8963678ce6039db652cf6a
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Thu Mar 28 15:00:00 2013 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Thu Mar 28 15:01:12 2013 -0700
tree 340ab2b3cd20cd572f84e18067b22ca4d16638ae
parent 9b5698779052412e50e4ffa1fbfa66cc040362a2

apps: *BUG* Solving a small bug with ndn::ConsumerZipfMandelbrot, causing excessive memory utilization in some cases (m_N was used before being initialized)

apps/ndn-consumer-zipf-mandelbrot.cc

diff --git a/apps/ndn-consumer-zipf-mandelbrot.cc b/apps/ndn-consumer-zipf-mandelbrot.cc
index 5d5d760..e15cf3a 100644
--- a/apps/ndn-consumer-zipf-mandelbrot.cc
+++ b/apps/ndn-consumer-zipf-mandelbrot.cc
@@ -44,20 +44,20 @@
     .SetParent<ConsumerCbr> ()
     .AddConstructor<ConsumerZipfMandelbrot> ()
 
-    .AddAttribute ("q", "parameter of improve rank",
-                   StringValue ("0.7"),
-                   MakeDoubleAccessor (&ConsumerZipfMandelbrot::SetQ, &ConsumerZipfMandelbrot::GetQ),
-                   MakeDoubleChecker<double> ())
-    .AddAttribute ("s", "parameter of power",
-                   StringValue ("0.7"),
-                   MakeDoubleAccessor (&ConsumerZipfMandelbrot::SetS, &ConsumerZipfMandelbrot::GetS),
-                   MakeDoubleChecker<double> ())
-
     .AddAttribute ("NumberOfContents", "Number of the Contents in total",
                    StringValue ("100"),
                    MakeUintegerAccessor (&ConsumerZipfMandelbrot::SetNumberOfContents, &ConsumerZipfMandelbrot::GetNumberOfContents),
                    MakeUintegerChecker<uint32_t> ())
 
+    .AddAttribute ("q", "parameter of improve rank",
+                   StringValue ("0.7"),
+                   MakeDoubleAccessor (&ConsumerZipfMandelbrot::SetQ, &ConsumerZipfMandelbrot::GetQ),
+                   MakeDoubleChecker<double> ())
+    
+    .AddAttribute ("s", "parameter of power",
+                   StringValue ("0.7"),
+                   MakeDoubleAccessor (&ConsumerZipfMandelbrot::SetS, &ConsumerZipfMandelbrot::GetS),
+                   MakeDoubleChecker<double> ())
     ;
 
   return tid;
@@ -65,7 +65,8 @@
 
 
 ConsumerZipfMandelbrot::ConsumerZipfMandelbrot()
-  : m_q (0.7)
+  : m_N (100) // needed here to make sure when SetQ/SetS are called, there is a valid value of N
+  , m_q (0.7)
   , m_s (0.7)
   , m_SeqRng (0.0, 1.0)
 {
@@ -81,7 +82,7 @@
 {
   m_N = numOfContents;
 
-  // NS_LOG_DEBUG (m_q << " and " << m_s << " and " << m_N);
+  NS_LOG_DEBUG (m_q << " and " << m_s << " and " << m_N);
 
   m_Pcum = std::vector<double> (m_N + 1);