commit 372cbab5a8b8a64ac29ddb4cf2db01330665b1c1
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Wed Aug 22 09:43:53 2012 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Tue Sep 04 00:00:51 2012 -0700
tree 58a0ddaefbff611d423f01afed4a8aed9c821bca
parent 0ffa7167b7e06b81692c2c13d1faa74fdd337eb0

Base per-incoming queue limit on per-Face limit (instead of a precompiled value)

utils/ndn-pit-queue.cc

diff --git a/utils/ndn-pit-queue.cc b/utils/ndn-pit-queue.cc
index f8feb72..75ce818 100644
--- a/utils/ndn-pit-queue.cc
+++ b/utils/ndn-pit-queue.cc
@@ -35,22 +35,22 @@
 namespace ndn {
 
 PitQueue::PitQueue ()
-  : m_maxQueueSize (20)
-  , m_lastQueue (m_queues.end ())
+  // : m_maxQueueSize (20)
+  : m_lastQueue (m_queues.end ())
 {
 }
   
-void
-PitQueue::SetMaxQueueSize (uint32_t size)
-{
-  m_maxQueueSize = size;
-}
+// void
+// PitQueue::SetMaxQueueSize (uint32_t size)
+// {
+//   m_maxQueueSize = size;
+// }
 
-uint32_t
-PitQueue::GetMaxQueueSize () const
-{
-  return m_maxQueueSize;
-}
+// uint32_t
+// PitQueue::GetMaxQueueSize () const
+// {
+//   return m_maxQueueSize;
+// }
 
 
 bool
@@ -67,7 +67,7 @@
       queue = itemPair.first;
     }
   
-  if (queue->second->size () >= m_maxQueueSize)
+  if (queue->second->size () >= inFace->GetLimits ().GetMaxLimit ())
       return false;
 
   Queue::iterator itemIterator = queue->second->insert (queue->second->end (), pitEntry);

utils/ndn-pit-queue.h

diff --git a/utils/ndn-pit-queue.h b/utils/ndn-pit-queue.h
index aad6820..993cb83 100644
--- a/utils/ndn-pit-queue.h
+++ b/utils/ndn-pit-queue.h
@@ -109,7 +109,7 @@
   typedef std::map< Ptr<Face>, boost::shared_ptr<Queue> > PerInFaceQueue;
 
 private:
-  uint32_t m_maxQueueSize;
+  // uint32_t m_maxQueueSize;
   PerInFaceQueue::iterator m_lastQueue; // last queue from which interest was taken
   PerInFaceQueue m_queues;
 };