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

Util: Move SyntheticREDQueue from router to core

Browse Source 
in prep for use by i2psnark, to follow
log tweak
This commit is contained in:
zzz
2023-12-23 08:14:24 -05:00
parent 394a2b1635
commit 399507805f
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
router/java/src/net/i2p/router/transport/SyntheticREDQueue.java → core/java/src/net/i2p/util/SyntheticREDQueue.java
View File

@@ -1,9 +1,7 @@
package net.i2p.router.transport; package net.i2p.util;
import net.i2p.I2PAppContext; import net.i2p.I2PAppContext;
import net.i2p.data.DataHelper; import net.i2p.data.DataHelper;
import net.i2p.util.BandwidthEstimator;
import net.i2p.util.Log;
/** /**
* A "synthetic" queue in that it doesn't actually queue anything. * A "synthetic" queue in that it doesn't actually queue anything.
@@ -45,9 +43,9 @@ import net.i2p.util.Log;
* *
* Adapted from: Linux kernel tcp_westwood.c (GPLv2) * Adapted from: Linux kernel tcp_westwood.c (GPLv2)
* *
* @since 0.9.50 adapted from streaming * @since 0.9.50 adapted from streaming; moved from transport in 0.9.62
*/ */
class SyntheticREDQueue implements BandwidthEstimator { public class SyntheticREDQueue implements BandwidthEstimator {
private final I2PAppContext _context; private final I2PAppContext _context;
private final Log _log; private final Log _log;
@@ -94,7 +92,7 @@ class SyntheticREDQueue implements BandwidthEstimator {
* *
* @param bwBps the output rate of the queue in Bps * @param bwBps the output rate of the queue in Bps
*/ */
SyntheticREDQueue(I2PAppContext ctx, int bwBps) { public SyntheticREDQueue(I2PAppContext ctx, int bwBps) {
// the goal is to drop here rather than let the traffic // the goal is to drop here rather than let the traffic
// get through to UDP-Sender CoDel and get dropped there, // get through to UDP-Sender CoDel and get dropped there,
// when we're at the default 80% share or below. // when we're at the default 80% share or below.
@@ -369,6 +367,8 @@ class SyntheticREDQueue implements BandwidthEstimator {
' ' + DataHelper.formatSize2Decimal((long) (_bKFiltered * 1000), false) + ' ' + DataHelper.formatSize2Decimal((long) (_bKFiltered * 1000), false) +
"Bps, avg_qsize " + "Bps, avg_qsize " +
DataHelper.formatSize2((long) _avgQSize, false) + DataHelper.formatSize2((long) _avgQSize, false) +
"B]"; "B, limit " +
DataHelper.formatSize2Decimal((long) _bwBps, false) +
"Bps]";
} }
} }

1
router/java/src/net/i2p/router/transport/FIFOBandwidthRefiller.java
View File

@@ -9,6 +9,7 @@ import net.i2p.data.DataHelper;
import net.i2p.router.RouterContext; import net.i2p.router.RouterContext;
import net.i2p.router.transport.FIFOBandwidthLimiter.Request; import net.i2p.router.transport.FIFOBandwidthLimiter.Request;
import net.i2p.util.Log; import net.i2p.util.Log;
import net.i2p.util.SyntheticREDQueue;
/** /**
* Thread that runs several times a second to "give" bandwidth to * Thread that runs several times a second to "give" bandwidth to