commit ccbd83486b4ec606a1d79c07be0c78ffd018cebf
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Thu Aug 16 16:54:39 2012 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Tue Sep 04 00:00:50 2012 -0700
tree 333a0057b9165114e239399cda6b267b1166dbdd
parent 92b5f8394b073223ad6f08047b93392537eb7305

(Re-)Implementing randomized Interest accept based on satisfaction ratio stats.

model/fw/per-fib-limits.cc

diff --git a/model/fw/per-fib-limits.cc b/model/fw/per-fib-limits.cc
index 08ef66b..aa21ff2 100644
--- a/model/fw/per-fib-limits.cc
+++ b/model/fw/per-fib-limits.cc
@@ -30,6 +30,7 @@
 #include "ns3/log.h"
 #include "ns3/simulator.h"
 #include "ns3/random-variable.h"
+#include "ns3/double.h"
 
 #include <boost/foreach.hpp>
 #include <boost/lambda/lambda.hpp>
@@ -51,6 +52,16 @@
     .SetGroupName ("Ndn")
     .SetParent <FwStats> ()
     .AddConstructor <PerFibLimits> ()
+
+    .AddAttribute ("Threshold", "Minimum number of incoming interests to enable dropping decision",
+                   DoubleValue (0.25),
+                   MakeDoubleAccessor (&PerFibLimits::m_threshold),
+                   MakeDoubleChecker<double> ())
+    
+    .AddAttribute ("GraceAcceptProbability", "Probability to accept Interest even though stats telling that satisfaction ratio is 0",
+                   DoubleValue (0.01),
+                   MakeDoubleAccessor (&PerFibLimits::m_graceAcceptProbability),
+                   MakeDoubleChecker<double> ())
     ;
   return tid;
 }
@@ -87,13 +98,13 @@
   // const ndnSIM::LoadStatsFace &stats = GetStatsTree ()[header->GetName ()].incoming ().find (inFace)->second;
   const ndnSIM::LoadStatsFace &stats = GetStatsTree ()["/"].incoming ().find (inFace)->second;
 
-  if (stats.count ().GetStats ().get<0> () >= 0.5 * pitEntry->GetFibEntry ()->GetLimits ().GetMaxLimit ())
+  if (stats.count ().GetStats ().get<0> () >= m_threshold * pitEntry->GetFibEntry ()->GetLimits ().GetMaxLimit ())
   {
     double ratio = std::min (1.0, stats.GetSatisfiedRatio ().get<0> ());
     // NS_ASSERT_MSG (ratio > 0, "If count is a reasonable value, ratio cannot be negative");
     UniformVariable randAccept (0, 1);
     double dice = randAccept.GetValue ();
-    if (ratio < 0 || dice < ratio + 0.1)
+    if (ratio < 0 || dice < ratio + m_graceAcceptProbability)
       {
         // ok, accepting the interests
       }

model/fw/per-fib-limits.h

diff --git a/model/fw/per-fib-limits.h b/model/fw/per-fib-limits.h
index 2ee5141..75d9f6e 100644
--- a/model/fw/per-fib-limits.h
+++ b/model/fw/per-fib-limits.h
@@ -70,6 +70,9 @@
 private:
   EventId m_decayLimitsEvent;
 
+  double m_threshold;
+  double m_graceAcceptProbability;
+
   typedef FwStats super;
 };