I2P_Developers/i2p.itoopie
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

* ExploratoryPeerSelector:

Browse Source 
- Exclude floodfill peers
      - Tweak the HighCap vs. NonFailing decision
    * i2psnark: Increase retries for .torrent fetch
    * IRC Proxy: Prevent mIRC from sending an alternate DCC request
      containing an IP
    * readme.html: Reorder some items
    * Stats: Add some more required stats
    * Streaming lib: Fix slow start to be exponential growth,
      fix congestion avoidance to be linear growth.
      Should speed up local connections a lot, and remote
      connections a little.
This commit is contained in:
zzz
2008-03-19 00:20:15 +00:00
parent 8886d61caa
commit 6e981874a5
11 changed files with 95 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -302,24 +302,35 @@ public class ConnectionPacketHandler {
_context.statManager().addRateData("stream.trend", trend, newWindowSize);
if ( (!congested) && (acked > 0) && (numResends <= 0) ) {
if (trend < 0) {
if (newWindowSize < con.getLastCongestionSeenAt() / 2) {
// Don't make this <= LastCongestion/2 or we'll jump right back to where we were
// slow start - exponential growth
// grow acked/N times (where N = the slow start factor)
// always grow at least 1
int factor = con.getOptions().getSlowStartGrowthRateFactor();
if (factor <= 1)
newWindowSize += acked;
else if (acked < factor)
newWindowSize++;
else
newWindowSize += acked / factor;
if (_log.shouldLog(Log.DEBUG))
_log.debug("slow start acks = " + acked + " for " + con);
} else if (trend < 0) {
// rtt is shrinking, so lets increment the cwin
newWindowSize++;
} else if (newWindowSize > con.getLastCongestionSeenAt() / 2) {
if (_log.shouldLog(Log.DEBUG))
_log.debug("trend < 0 for " + con);
} else {
// congestion avoidance
// we can't use newWindowSize += 1/newWindowSize, since we're
// linear growth - increase window 1/N per RTT
// we can't use newWindowSize += acked/(oldWindow*N) (where N = the cong. avoid. factor), since we're
// integers, so lets use a random distribution instead
int shouldIncrement = _context.random().nextInt(con.getOptions().getCongestionAvoidanceGrowthRateFactor()*newWindowSize);
if (shouldIncrement <= 0)
newWindowSize += 1;
} else {
// slow start, but modified to take into account the fact
// that windows in the streaming lib are messages, not bytes,
// so we only grow 1 every N times (where N = the slow start factor)
int shouldIncrement = _context.random().nextInt(con.getOptions().getSlowStartGrowthRateFactor());
if (shouldIncrement <= 0)
if (shouldIncrement < acked)
newWindowSize += 1;
if (_log.shouldLog(Log.DEBUG))
_log.debug("cong. avoid acks = " + acked + " for " + con);
}
}