I2P_Developers/i2p.android.base
3
0
Fork 2
Code Issues 39 Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Backport rev 1c20e222438c8098ed49a4e5a5a609f0d2cf14c5 before the prop forward

Browse Source
This commit is contained in:
zzz
2009-02-15 14:27:46 +00:00
parent 775ab9a7bf
commit 129fc5b838
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -126,6 +126,7 @@ public class Connection {
_isInbound = false; _isInbound = false;
_updatedShareOpts = false; _updatedShareOpts = false;
_connectionEvent = new ConEvent(); _connectionEvent = new ConEvent();
_hardDisconnected = false;
_randomWait = _context.random().nextInt(10*1000); // just do this once to reduce usage _randomWait = _context.random().nextInt(10*1000); // just do this once to reduce usage
_context.statManager().createRateStat("stream.con.windowSizeAtCongestion", "How large was our send window when we send a dup?", "Stream", new long[] { 60*1000, 10*60*1000, 60*60*1000 }); _context.statManager().createRateStat("stream.con.windowSizeAtCongestion", "How large was our send window when we send a dup?", "Stream", new long[] { 60*1000, 10*60*1000, 60*60*1000 });
_context.statManager().createRateStat("stream.chokeSizeBegin", "How many messages were outstanding when we started to choke?", "Stream", new long[] { 60*1000, 10*60*1000, 60*60*1000 }); _context.statManager().createRateStat("stream.chokeSizeBegin", "How many messages were outstanding when we started to choke?", "Stream", new long[] { 60*1000, 10*60*1000, 60*60*1000 });
@ -154,7 +155,7 @@ public class Connection {
* @return true if the packet should be sent * @return true if the packet should be sent
*/ */
boolean packetSendChoke(long timeoutMs) { boolean packetSendChoke(long timeoutMs) {
if (false) return true; // if (false) return true; // <--- what the fuck??
long start = _context.clock().now(); long start = _context.clock().now();
long writeExpire = start + timeoutMs; long writeExpire = start + timeoutMs;
boolean started = false; boolean started = false;
@ -168,9 +169,9 @@ public class Connection {
// no need to wait until the other side has ACKed us before sending the first few wsize // no need to wait until the other side has ACKed us before sending the first few wsize
// packets through // packets through
// if (!_connected) // Incorrect assumption, the constructor defaults _connected to true --Sponge
// return false; if (!_connected)
return false;
started = true; started = true;
if ( (_outboundPackets.size() >= _options.getWindowSize()) || (_activeResends > 0) || if ( (_outboundPackets.size() >= _options.getWindowSize()) || (_activeResends > 0) ||
(_lastSendId - _highestAckedThrough > _options.getWindowSize()) ) { (_lastSendId - _highestAckedThrough > _options.getWindowSize()) ) {
@ -186,12 +187,12 @@ public class Connection {
if (_log.shouldLog(Log.DEBUG)) if (_log.shouldLog(Log.DEBUG))
_log.debug("Outbound window is full (" + _outboundPackets.size() + "/" + _options.getWindowSize() + "/" _log.debug("Outbound window is full (" + _outboundPackets.size() + "/" + _options.getWindowSize() + "/"
+ _activeResends + "), waiting " + timeLeft); + _activeResends + "), waiting " + timeLeft);
try { _outboundPackets.wait(timeLeft); } catch (InterruptedException ie) {} try { _outboundPackets.wait(Math.min(timeLeft,250l)); } catch (InterruptedException ie) {}
} else { } else {
if (_log.shouldLog(Log.DEBUG)) if (_log.shouldLog(Log.DEBUG))
_log.debug("Outbound window is full (" + _outboundPackets.size() + "/" + _activeResends _log.debug("Outbound window is full (" + _outboundPackets.size() + "/" + _activeResends
+ "), waiting indefinitely"); + "), waiting indefinitely");
try { _outboundPackets.wait(10*1000); } catch (InterruptedException ie) {} try { _outboundPackets.wait(250); } catch (InterruptedException ie) {} //10*1000
} }
} else { } else {
_context.statManager().addRateData("stream.chokeSizeEnd", _outboundPackets.size(), _context.clock().now() - start); _context.statManager().addRateData("stream.chokeSizeEnd", _outboundPackets.size(), _context.clock().now() - start);
@ -494,7 +495,6 @@ public class Connection {
synchronized (_connectLock) { _connectLock.notifyAll(); } synchronized (_connectLock) { _connectLock.notifyAll(); }
if (_log.shouldLog(Log.DEBUG)) if (_log.shouldLog(Log.DEBUG))
_log.debug("Disconnecting " + toString(), new Exception("discon")); _log.debug("Disconnecting " + toString(), new Exception("discon"));
if (!cleanDisconnect) { if (!cleanDisconnect) {
_hardDisconnected = true; _hardDisconnected = true;
if (_log.shouldLog(Log.WARN)) if (_log.shouldLog(Log.WARN))
@ -1017,7 +1017,6 @@ public class Connection {
/** /**
* Coordinate the resends of a given packet * Coordinate the resends of a given packet
*
*/ */
public class ResendPacketEvent extends SimpleTimer2.TimedEvent { public class ResendPacketEvent extends SimpleTimer2.TimedEvent {
private PacketLocal _packet; private PacketLocal _packet;