Author: toad
Date: 2008-04-19 17:28:52 +0000 (Sat, 19 Apr 2008)
New Revision: 19440

Modified:
   trunk/freenet/src/freenet/support/DoubleTokenBucket.java
Log:
We want to make nanosPerTick bigger for the grabbedBytesLimiter, not smaller.
So DoubleTokenBucket was limiting forceGrab()'s to ~ 125% of the limit, not 80%.

Modified: trunk/freenet/src/freenet/support/DoubleTokenBucket.java
===================================================================
--- trunk/freenet/src/freenet/support/DoubleTokenBucket.java    2008-04-19 
17:20:41 UTC (rev 19439)
+++ trunk/freenet/src/freenet/support/DoubleTokenBucket.java    2008-04-19 
17:28:52 UTC (rev 19440)
@@ -15,7 +15,7 @@
                super(max, nanosPerTick, initialValue);
                if(forceGrabLimit > 1.0) throw new IllegalArgumentException();
                logMINOR = Logger.shouldLog(Logger.MINOR, this);
-               grabbedBytesLimiter = new TokenBucket((long)(max * 
forceGrabLimit), (long)(nanosPerTick * forceGrabLimit), (long)(initialValue * 
forceGrabLimit));
+               grabbedBytesLimiter = new TokenBucket((long)(max * 
forceGrabLimit), (long)(nanosPerTick / forceGrabLimit), (long)(initialValue * 
forceGrabLimit));
        }

        public synchronized void forceGrab(long tokens) {


Reply via email to