Author: toad
Date: 2007-03-24 19:44:10 +0000 (Sat, 24 Mar 2007)
New Revision: 12327
Modified:
trunk/freenet/src/freenet/node/Node.java
trunk/freenet/src/freenet/node/NodeStats.java
Log:
Put both applications of the fudge factor on input bandwidth limit into node
Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java 2007-03-24 19:41:48 UTC (rev
12326)
+++ trunk/freenet/src/freenet/node/Node.java 2007-03-24 19:44:10 UTC (rev
12327)
@@ -865,7 +865,7 @@
new IntCallback() {
public int get() {
if(inputLimitDefault) return -1;
- return
nodeStats.getInputLimit();
+ return
(nodeStats.getInputLimit() * 4) / 5;
}
public void set(int ibwLimit) throws
InvalidConfigValueException {
if(ibwLimit == -1) {
Modified: trunk/freenet/src/freenet/node/NodeStats.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeStats.java 2007-03-24 19:41:48 UTC
(rev 12326)
+++ trunk/freenet/src/freenet/node/NodeStats.java 2007-03-24 19:44:10 UTC
(rev 12327)
@@ -723,7 +723,7 @@
}
public int getInputLimit() {
- return (((int) ((1000L * 1000L * 1000L) /
requestInputThrottle.getNanosPerTick())) * 5) / 4;
+ return ((int) ((1000L * 1000L * 1000L) /
requestInputThrottle.getNanosPerTick()));
}
public boolean isTestnetEnabled() {
