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

Streaming: Cleanup, use field instead of method

Browse Source
This commit is contained in:
zzz
2020-05-01 11:19:07 +00:00
parent dd96e29213
commit d7095b69b9
1 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
apps/streaming/java/src/net/i2p/client/streaming/impl/Connection.java
View File

@ -584,7 +584,7 @@ class Connection {
_bwEstimator.addSample(acked.size()); _bwEstimator.addSample(acked.size());
if (anyLeft) { if (anyLeft) {
// RFC 6298 section 5.3 // RFC 6298 section 5.3
int rto = getOptions().getRTO(); int rto = _options.getRTO();
_retransmitEvent.pushBackRTO(rto); _retransmitEvent.pushBackRTO(rto);
if (_log.shouldLog(Log.DEBUG)) if (_log.shouldLog(Log.DEBUG))
@ -1122,7 +1122,7 @@ class Connection {
// ... // ...
// We don't do any of that, but we set the window size to 1, and let the retransmission // We don't do any of that, but we set the window size to 1, and let the retransmission
// of packets do the "attempted recovery". // of packets do the "attempted recovery".
getOptions().setWindowSize(1); _options.setWindowSize(1);
} }
} }
@ -1420,9 +1420,9 @@ class Connection {
buf.append(" rcvd: ").append(1 + _inputStream.getHighestBlockId() - missing); buf.append(" rcvd: ").append(1 + _inputStream.getHighestBlockId() - missing);
buf.append(" ackThru ").append(_highestAckedThrough); buf.append(" ackThru ").append(_highestAckedThrough);
buf.append(" ssThresh ").append(_ssthresh); buf.append(" ssThresh ").append(_ssthresh);
buf.append(" minRTT ").append(getOptions().getMinRTT()); buf.append(" minRTT ").append(_options.getMinRTT());
buf.append(" maxWin ").append(getOptions().getMaxWindowSize()); buf.append(" maxWin ").append(_options.getMaxWindowSize());
buf.append(" MTU ").append(getOptions().getMaxMessageSize()); buf.append(" MTU ").append(_options.getMaxMessageSize());
buf.append("]"); buf.append("]");
return buf.toString(); return buf.toString();
@ -1479,7 +1479,7 @@ class Connection {
// 1. Double RTO and backoff (RFC 6298 section 5.5 & 5.6) // 1. Double RTO and backoff (RFC 6298 section 5.5 & 5.6)
final long now = _context.clock().now(); final long now = _context.clock().now();
pushBackRTO(getOptions().doubleRTO()); pushBackRTO(_options.doubleRTO());
// 2. cut ssthresh to bandwidth estimate, window to 1 // 2. cut ssthresh to bandwidth estimate, window to 1
List<PacketLocal> toResend = null; List<PacketLocal> toResend = null;
@ -1494,9 +1494,9 @@ class Connection {
if (oldest.getNumSends() == 1) { if (oldest.getNumSends() == 1) {
if (_log.shouldLog(Log.DEBUG)) if (_log.shouldLog(Log.DEBUG))
_log.debug(Connection.this + " cutting ssthresh and window"); _log.debug(Connection.this + " cutting ssthresh and window");
_ssthresh = Math.max( (int)(_bwEstimator.getBandwidthEstimate() * getOptions().getMinRTT()), 2 ); _ssthresh = Math.max( (int)(_bwEstimator.getBandwidthEstimate() * _options.getMinRTT()), 2 );
_ssthresh = Math.min(ConnectionPacketHandler.MAX_SLOW_START_WINDOW, _ssthresh); _ssthresh = Math.min(ConnectionPacketHandler.MAX_SLOW_START_WINDOW, _ssthresh);
getOptions().setWindowSize(1); _options.setWindowSize(1);
} else if (_log.shouldLog(Log.DEBUG)) } else if (_log.shouldLog(Log.DEBUG))
_log.debug(Connection.this + " not cutting ssthresh and window"); _log.debug(Connection.this + " not cutting ssthresh and window");
@ -1508,7 +1508,7 @@ class Connection {
boolean sentAny = false; boolean sentAny = false;
for (PacketLocal packet : toResend) { for (PacketLocal packet : toResend) {
final int nResends = packet.getNumSends(); final int nResends = packet.getNumSends();
if (packet.getNumSends() > getOptions().getMaxResends()) { if (packet.getNumSends() > _options.getMaxResends()) {
if (_log.shouldLog(Log.DEBUG)) if (_log.shouldLog(Log.DEBUG))
_log.debug(Connection.this + " packet " + packet + " resent too many times, closing"); _log.debug(Connection.this + " packet " + packet + " resent too many times, closing");
packet.cancelled(); packet.cancelled();
@ -1548,15 +1548,15 @@ class Connection {
} }
// this seems unnecessary to send the MSS again: // this seems unnecessary to send the MSS again:
//_packet.setOptionalMaxSize(getOptions().getMaxMessageSize()); //_packet.setOptionalMaxSize(_options.getMaxMessageSize());
// bugfix release 0.7.8, we weren't dividing by 1000 // bugfix release 0.7.8, we weren't dividing by 1000
packet.setResendDelay(getOptions().getResendDelay() / 1000); packet.setResendDelay(_options.getResendDelay() / 1000);
if (packet.getReceiveStreamId() <= 0) if (packet.getReceiveStreamId() <= 0)
packet.setReceiveStreamId(_receiveStreamId.get()); packet.setReceiveStreamId(_receiveStreamId.get());
if (packet.getSendStreamId() <= 0) if (packet.getSendStreamId() <= 0)
packet.setSendStreamId(_sendStreamId.get()); packet.setSendStreamId(_sendStreamId.get());
packet.setTimeout(getOptions().getRTO()); packet.setTimeout(_options.getRTO());
if (_outboundQueue.enqueue(packet)) { if (_outboundQueue.enqueue(packet)) {
@ -1673,19 +1673,19 @@ class Connection {
} }
// this seems unnecessary to send the MSS again: // this seems unnecessary to send the MSS again:
//_packet.setOptionalMaxSize(getOptions().getMaxMessageSize()); //_packet.setOptionalMaxSize(_options.getMaxMessageSize());
// bugfix release 0.7.8, we weren't dividing by 1000 // bugfix release 0.7.8, we weren't dividing by 1000
_packet.setResendDelay(getOptions().getResendDelay() / 1000); _packet.setResendDelay(_options.getResendDelay() / 1000);
if (_packet.getReceiveStreamId() <= 0) if (_packet.getReceiveStreamId() <= 0)
_packet.setReceiveStreamId(_receiveStreamId.get()); _packet.setReceiveStreamId(_receiveStreamId.get());
if (_packet.getSendStreamId() <= 0) if (_packet.getSendStreamId() <= 0)
_packet.setSendStreamId(_sendStreamId.get()); _packet.setSendStreamId(_sendStreamId.get());
int newWindowSize = getOptions().getWindowSize(); int newWindowSize = _options.getWindowSize();
if (_isChoked) { if (_isChoked) {
congestionOccurred(); congestionOccurred();
getOptions().setWindowSize(1); _options.setWindowSize(1);
} else if (_ackSinceCongestion.get()) { } else if (_ackSinceCongestion.get()) {
// only shrink the window once per window // only shrink the window once per window
if (_packet.getSequenceNum() > _lastCongestionHighestUnacked) { if (_packet.getSequenceNum() > _lastCongestionHighestUnacked) {
@ -1696,18 +1696,18 @@ class Connection {
// See RFC 6298 section 5 item 5.5 // See RFC 6298 section 5 item 5.5
// This prevents being stuck at a window size of 1, retransmitting every packet, // This prevents being stuck at a window size of 1, retransmitting every packet,
// never updating the RTT or RTO. // never updating the RTT or RTO.
getOptions().doubleRTO(); _options.doubleRTO();
if (_packet.getNumSends() == 1) { if (_packet.getNumSends() == 1) {
_ssthresh = Math.max( (int)(_bwEstimator.getBandwidthEstimate() * getOptions().getMinRTT()), 2 ); _ssthresh = Math.max( (int)(_bwEstimator.getBandwidthEstimate() * _options.getMinRTT()), 2 );
_ssthresh = Math.min(ConnectionPacketHandler.MAX_SLOW_START_WINDOW, _ssthresh); _ssthresh = Math.min(ConnectionPacketHandler.MAX_SLOW_START_WINDOW, _ssthresh);
int wsize = getOptions().getWindowSize(); int wsize = _options.getWindowSize();
getOptions().setWindowSize(Math.min(_ssthresh, wsize)); _options.setWindowSize(Math.min(_ssthresh, wsize));
} }
if (_log.shouldLog(Log.INFO)) if (_log.shouldLog(Log.INFO))
_log.info("Congestion, resending packet " + _packet.getSequenceNum() + " (new windowSize " + newWindowSize _log.info("Congestion, resending packet " + _packet.getSequenceNum() + " (new windowSize " + newWindowSize
+ "/" + getOptions().getWindowSize() + ") for " + Connection.this.toString()); + "/" + _options.getWindowSize() + ") for " + Connection.this.toString());
windowAdjusted(); windowAdjusted();
} }