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

Hardcode TCP constants

Browse Source 
Various suggestions by zzz
This commit is contained in:
zab2
2013-07-18 22:25:10 +00:00
parent ae347c4fa1
commit 55d571ffec
2 changed files with 11 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
apps/streaming/java/src/net/i2p/client/streaming/ConnectionOptions.java
View File

@ -27,7 +27,7 @@ class ConnectionOptions extends I2PSocketOptionsImpl {
private int _profile; private int _profile;
private int _rtt; private int _rtt;
private int _rttDev; private int _rttDev;
private int _rto; private int _rto = INITIAL_RTO;
private int _resendDelay; private int _resendDelay;
private int _sendAckDelay; private int _sendAckDelay;
private int _maxMessageSize; private int _maxMessageSize;
@ -51,12 +51,9 @@ class ConnectionOptions extends I2PSocketOptionsImpl {
private int _maxTotalConnsPerDay; private int _maxTotalConnsPerDay;
private int _maxConns; private int _maxConns;
private boolean _disableRejectLog; private boolean _disableRejectLog;
private double _alpha;
private double _beta;
private double _kappa;
/** state of a connection */ /** state of a connection */
enum AckInit { private enum AckInit {
INIT, // just created INIT, // just created
FIRST, // first received ack FIRST, // first received ack
STEADY STEADY
@ -85,9 +82,6 @@ class ConnectionOptions extends I2PSocketOptionsImpl {
private static final double TCP_ALPHA = 1.0/8; private static final double TCP_ALPHA = 1.0/8;
private static final double TCP_BETA = 1.0/4; private static final double TCP_BETA = 1.0/4;
private static final double TCP_KAPPA = 4; private static final double TCP_KAPPA = 4;
private static final String PROP_TCP_ALPHA= "i2p.streaming.alpha";
private static final String PROP_TCP_BETA= "i2p.streaming.beta";
private static final String PROP_TCP_KAPPA = "i2p.streaming.kappa";
private static final String PROP_INITIAL_RTO = "i2p.streaming.initialRTO"; private static final String PROP_INITIAL_RTO = "i2p.streaming.initialRTO";
private static final int INITIAL_RTO = 12000; private static final int INITIAL_RTO = 12000;
@ -387,10 +381,6 @@ class ConnectionOptions extends I2PSocketOptionsImpl {
_maxTotalConnsPerDay = getInt(opts, PROP_MAX_TOTAL_CONNS_DAY, 0); _maxTotalConnsPerDay = getInt(opts, PROP_MAX_TOTAL_CONNS_DAY, 0);
_maxConns = getInt(opts, PROP_MAX_STREAMS, 0); _maxConns = getInt(opts, PROP_MAX_STREAMS, 0);
_alpha = getDouble(opts, PROP_TCP_ALPHA, TCP_ALPHA);
_beta = getDouble(opts, PROP_TCP_BETA, TCP_BETA);
_kappa = getDouble(opts, PROP_TCP_KAPPA, TCP_KAPPA);
_rto = getInt(opts, PROP_INITIAL_RTO, INITIAL_RTO); _rto = getInt(opts, PROP_INITIAL_RTO, INITIAL_RTO);
} }
@ -458,9 +448,6 @@ class ConnectionOptions extends I2PSocketOptionsImpl {
if (opts.containsKey(PROP_MAX_STREAMS)) if (opts.containsKey(PROP_MAX_STREAMS))
_maxConns = getInt(opts, PROP_MAX_STREAMS, 0); _maxConns = getInt(opts, PROP_MAX_STREAMS, 0);
_alpha = getDouble(opts, PROP_TCP_ALPHA, TCP_ALPHA);
_beta = getDouble(opts, PROP_TCP_BETA, TCP_BETA);
_kappa = getDouble(opts, PROP_TCP_KAPPA, TCP_KAPPA);
_rto = getInt(opts, PROP_INITIAL_RTO, INITIAL_RTO); _rto = getInt(opts, PROP_INITIAL_RTO, INITIAL_RTO);
} }
@ -599,7 +586,7 @@ class ConnectionOptions extends I2PSocketOptionsImpl {
_rto = _rtt + _rtt / 2; _rto = _rtt + _rtt / 2;
break; break;
case STEADY : case STEADY :
_rto = _rtt + (int) (_rttDev * _kappa); _rto = _rtt + (int) (_rttDev * TCP_KAPPA);
break; break;
} }
@ -632,11 +619,11 @@ class ConnectionOptions extends I2PSocketOptionsImpl {
setRTT(measuredValue); // no smoothing first sample setRTT(measuredValue); // no smoothing first sample
break; break;
case FIRST: case FIRST:
_initState = AckInit.STEADY; _initState = AckInit.STEADY; // fall through
case STEADY: case STEADY:
// calculation matches that recommended in RFC 6298 // calculation matches that recommended in RFC 6298
_rttDev = (int) ((1-_beta) *_rttDev + _beta * Math.abs(measuredValue-_rtt)); _rttDev = (int) ((1-TCP_BETA) *_rttDev + TCP_BETA * Math.abs(measuredValue-_rtt));
int smoothed = (int)((1-_alpha)*_rtt + _alpha*measuredValue); int smoothed = (int)((1-TCP_ALPHA)*_rtt + TCP_ALPHA*measuredValue);
setRTT(smoothed); setRTT(smoothed);
} }
computeRTO(); computeRTO();

8
apps/streaming/java/src/net/i2p/client/streaming/TCBShare.java
View File

@ -2,6 +2,7 @@ package net.i2p.client.streaming;
import java.util.Iterator; import java.util.Iterator;
import java.util.Map; import java.util.Map;
import java.util.Properties;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import net.i2p.I2PAppContext; import net.i2p.I2PAppContext;
@ -48,9 +49,10 @@ class TCBShare {
_context = ctx; _context = ctx;
_log = ctx.logManager().getLog(TCBShare.class); _log = ctx.logManager().getLog(TCBShare.class);
_rttDampening = getDouble(ctx.getProperties(), RTT_DAMP_PROP, RTT_DAMPENING); final Properties props = ctx.getProperties();
_wdwDampening = getDouble(ctx.getProperties(), WDW_DAMP_PROP, WDW_DAMPENING); _rttDampening = getDouble(props, RTT_DAMP_PROP, RTT_DAMPENING);
_rttDevDampening = getDouble(ctx.getProperties(), RTTDEV_DAMP_PROP, RTTDEV_DAMPENING); _wdwDampening = getDouble(props, WDW_DAMP_PROP, WDW_DAMPENING);
_rttDevDampening = getDouble(props, RTTDEV_DAMP_PROP, RTTDEV_DAMPENING);
_cache = new ConcurrentHashMap<Destination,Entry>(4); _cache = new ConcurrentHashMap<Destination,Entry>(4);
_cleaner = new CleanEvent(timer); _cleaner = new CleanEvent(timer);