loveisgrief/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Packages Projects Releases Wiki Activity

adjust target and interval, and backlogged indication

Browse Source
This commit is contained in:
zzz
2012-09-08 12:23:43 +00:00
parent aef021dcd1
commit 871f046755
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
router/java/src/net/i2p/router/util/CoDelBlockingQueue.java
View File

@@ -53,9 +53,11 @@ public class CoDelBlockingQueue<E extends CDQEntry> extends LinkedBlockingQueue<
* Below a target of 5 ms, utilization suffers for some conditions and traffic loads;
* above 5 ms there is very little or no improvement in utilization.
*
* I2P: Raise to 15 due to multithreading environment
*
* Maybe need to make configurable per-instance.
*/
private static final long TARGET = 5;
private static final long TARGET = 15;
/**
* Quote:
@@ -179,7 +181,8 @@ public class CoDelBlockingQueue<E extends CDQEntry> extends LinkedBlockingQueue<
E e = peek();
if (e == null)
return false;
return _context.clock().now() - e.getEnqueueTime() >= BACKLOG_TIME ||
return _dropping ||
_context.clock().now() - e.getEnqueueTime() >= BACKLOG_TIME ||
remainingCapacity() < _capacity / 4;
}

11
router/java/src/net/i2p/router/util/CoDelPriorityBlockingQueue.java
View File

@@ -56,17 +56,21 @@ public class CoDelPriorityBlockingQueue<E extends CDPQEntry> extends PriBlocking
* Below a target of 5 ms, utilization suffers for some conditions and traffic loads;
* above 5 ms there is very little or no improvement in utilization.
*
* I2P: Raise to 15 due to multithreading environment
*
* Maybe need to make configurable per-instance.
*/
private static final long TARGET = 5;
private static final long TARGET = 15;
/**
* Quote:
* A setting of 100 ms works well across a range of RTTs from 10 ms to 1 second
*
* I2P: Raise to 300 due to longer end-to-end RTTs
*
* Maybe need to make configurable per-instance.
*/
private static final long INTERVAL = 100;
private static final long INTERVAL = 300;
//private static final int MAXPACKET = 512;
private final String STAT_DROP;
@@ -164,7 +168,8 @@ public class CoDelPriorityBlockingQueue<E extends CDPQEntry> extends PriBlocking
E e = peek();
if (e == null)
return false;
return _context.clock().now() - e.getEnqueueTime() >= BACKLOG_TIME ||
return _dropping ||
_context.clock().now() - e.getEnqueueTime() >= BACKLOG_TIME ||
size() >= BACKLOG_SIZE;
}