commit 1fb9fed5f501f71df977cdbd83a3e7c24ac0c578
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Fri Feb 01 23:18:04 2013 -0800
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Fri Feb 01 23:18:04 2013 -0800
tree cc50330fdd6926076449c22bac39a5b3d022cfb8
parent 7456b70eb0f732b92e6fadf73273451e1a8305b5

model+examples: Small corrections with new PIT version, adding an example to use it

model/pit/custom-policies/serialized-size-policy.h

diff --git a/model/pit/custom-policies/serialized-size-policy.h b/model/pit/custom-policies/serialized-size-policy.h
index 0050ac6..7cfb506 100644
--- a/model/pit/custom-policies/serialized-size-policy.h
+++ b/model/pit/custom-policies/serialized-size-policy.h
@@ -105,15 +105,25 @@
       inline bool
       insert (typename parent_trie::iterator item)
       {
-        if (max_size_ != 0 && current_space_used_ >= max_size_)
+        uint32_t interestSize = item->payload ()->GetInterest ()->GetSerializedSize ();
+
+        // can't use logging here
+        NS_LOG_DEBUG ("Number of entries: " << policy_container::size ()
+                      << ", space used: " << current_space_used_
+                      << ", name: " << item->payload ()->GetPrefix ()
+                      << ", interest size: " << interestSize);
+
+        if (max_size_ != 0 && current_space_used_ + interestSize > max_size_)
           {
+            NS_LOG_DEBUG ("Rejecting PIT entry");
+
             // the current version just fails to add an element, but it also possible
             // to remove the largest element (last element in multi_map policy container)
             return false;
           }
 
-        get_size (item) = item->payload ()->GetInterest ()->GetSerializedSize ();
-        current_space_used_ += get_size (item);
+        get_size (item) = interestSize;
+        current_space_used_ += interestSize;
 
         policy_container::insert (*item);
         return true;
@@ -128,6 +138,8 @@
       inline void
       erase (typename parent_trie::iterator item)
       {
+        NS_LOG_DEBUG ("Erasing entry with name: " << item->payload ()->GetPrefix ());
+
         current_space_used_ -= get_size (item);
         policy_container::erase (policy_container::s_iterator_to (*item));
       }

model/pit/ndn-pit-impl.cc

diff --git a/model/pit/ndn-pit-impl.cc b/model/pit/ndn-pit-impl.cc
index 14b6b2a..3b693f8 100644
--- a/model/pit/ndn-pit-impl.cc
+++ b/model/pit/ndn-pit-impl.cc
@@ -28,9 +28,13 @@
 #include "../../utils/trie/persistent-policy.h"
 #include "../../utils/trie/random-policy.h"
 #include "../../utils/trie/lru-policy.h"
-#include "custom-policies/serialized-size-policy.h"
 
 #include "ns3/log.h"
+
+NS_LOG_COMPONENT_DEFINE ("ndn.pit.PitImpl");
+
+#include "custom-policies/serialized-size-policy.h"
+
 #include "ns3/string.h"
 #include "ns3/uinteger.h"
 #include "ns3/simulator.h"
@@ -38,7 +42,6 @@
 #include <boost/lambda/bind.hpp>
 #include <boost/lambda/lambda.hpp>
 
-NS_LOG_COMPONENT_DEFINE ("ndn.pit.PitImpl");
 
 using namespace boost::tuples;
 using namespace boost;