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

Streaming: Don't wait too long to send a dup ACK, so the other

Browse Source 
side isn't stuck forever at a window size of 1.
Cleanups, log tweaks, javadocs
This commit is contained in:
zzz
2015-04-23 15:34:24 +00:00
parent 64fdfd81ee
commit 772d0beac3
3 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -546,7 +546,11 @@ class ConnectionOptions extends I2PSocketOptionsImpl {
* @return round trip time estimate in ms
*/
public synchronized int getRTT() { return _rtt; }
public void setRTT(int ms) {
/**
* not public, use updateRTT()
*/
private void setRTT(int ms) {
synchronized (_trend) {
_trend[0] = _trend[1];
_trend[1] = _trend[2];
@ -569,6 +573,7 @@ class ConnectionOptions extends I2PSocketOptionsImpl {
/** used in TCB @since 0.9.8 */
synchronized int getRTTDev() { return _rttDev; }
private synchronized void setRTTDev(int rttDev) { _rttDev = rttDev; }
/**
@ -619,6 +624,9 @@ class ConnectionOptions extends I2PSocketOptionsImpl {
}
}
/**
* @param measuredValue must be positive
*/
public synchronized void updateRTT(int measuredValue) {
switch(_initState) {
case INIT:

7
apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionPacketHandler.java
View File

@ -194,7 +194,10 @@ class ConnectionPacketHandler {
_log.info(String.format("%s congestion.. dup packet %s ackDelay %d lastSend %s ago",
con, packet, ackDelay, DataHelper.formatDuration(now - lastSendTime)));
final long nextSendTime = lastSendTime + ackDelay;
// If this is longer than his RTO, he will always retransmit, and
// will be stuck at a window size of 1 forever. So we take the minimum
// of the ackDelay and half our estimated RTT to be sure.
final long nextSendTime = lastSendTime + Math.min(ackDelay, con.getOptions().getRTT() / 2);
if (nextSendTime <= now) {
if (_log.shouldLog(Log.DEBUG))
_log.debug("immediate ack");
@ -203,7 +206,7 @@ class ConnectionPacketHandler {
} else {
final long delay = nextSendTime - now;
if (_log.shouldLog(Log.DEBUG))
_log.debug("scheduling ack in "+delay);
_log.debug("scheduling ack in " + delay);
_context.simpleTimer2().addEvent(new AckDup(con), delay);
}

4
apps/streaming/java/src/net/i2p/client/streaming/impl/PacketHandler.java
View File

@ -114,7 +114,7 @@ class PacketHandler {
private static final SimpleDateFormat _fmt = new SimpleDateFormat("HH:mm:ss.SSS");
/** logs to System.out, and router log at debug level */
/** logs to router log at debug level */
void displayPacket(Packet packet, String prefix, String suffix) {
StringBuilder buf = new StringBuilder(256);
synchronized (_fmt) {
@ -125,7 +125,7 @@ class PacketHandler {
if (suffix != null)
buf.append(" ").append(suffix);
String str = buf.toString();
System.out.println(str);
//System.out.println(str);
_log.debug(str);
}