network: (fixes #2293) RED queue estimator optimization

2016-02-11 21:39:49 +01:00
parent 6cd269c2be
commit b830a39aa6
2 changed files with 2 additions and 7 deletions
--- a/1
+++ b/1
@@ -100,6 +100,7 @@ Bugs fixed
 - Bug 2286 - Support for SLL header (de)serialization.
 - Bug 2287 - FlowMonitor is confused by IP over IP.
 - Bug 2288 - Ipv4 broadcast and multicast packets are replicated on all the interfaces.
+- Bug 2293 - Red Queue Estimator spins when trying to compute queue average size under long idle times.

 Known issues
 ------------
--- a/src/network/utils/red-queue.cc
+++ b/src/network/utils/red-queue.cc
@@ -421,14 +421,8 @@ double
 RedQueue::Estimator (uint32_t nQueued, uint32_t m, double qAvg, double qW)
 {
  NS_LOG_FUNCTION (this << nQueued << m << qAvg << qW);
-  double newAve;

-  newAve = qAvg;
-  while (--m >= 1)
-    {
-      newAve *= 1.0 - qW;
-    }
-  newAve *= 1.0 - qW;
+  double newAve = qAvg * pow(1.0-qW, m);
  newAve += qW * nQueued;

  // implement adaptive RED