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

timeout gracefully even if the socket is stopped in odd places

Browse Source
This commit is contained in:
jrandom
2004-11-11 09:37:46 +00:00
committed by zzz
parent 6fc6866eb4
commit b457001b42
3 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -66,7 +66,7 @@ public class Connection {
public static final long MIN_RESEND_DELAY = 20*1000; public static final long MIN_RESEND_DELAY = 20*1000;
/** wait up to 5 minutes after disconnection so we can ack/close packets */ /** wait up to 5 minutes after disconnection so we can ack/close packets */
public static long DISCONNECT_TIMEOUT = 5*60*1000; public static int DISCONNECT_TIMEOUT = 5*60*1000;
/** lets be sane.. no more than 32 packets in the air in each dir */ /** lets be sane.. no more than 32 packets in the air in each dir */
public static final int MAX_WINDOW_SIZE = 32; public static final int MAX_WINDOW_SIZE = 32;

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

@ -108,7 +108,16 @@ public class MessageOutputStream extends OutputStream {
_dataLock.notifyAll(); _dataLock.notifyAll();
} }
if (_log.shouldLog(Log.DEBUG))
_log.debug("before waiting " + _writeTimeout + "ms for completion of " + ws);
if (_closed &&
( (_writeTimeout > Connection.DISCONNECT_TIMEOUT) ||
(_writeTimeout <= 0) ) )
ws.waitForCompletion(Connection.DISCONNECT_TIMEOUT);
else
ws.waitForCompletion(_writeTimeout); ws.waitForCompletion(_writeTimeout);
if (_log.shouldLog(Log.DEBUG))
_log.debug("after waiting " + _writeTimeout + "ms for completion of " + ws);
if (ws.writeFailed() && (_writeTimeout > 0) ) if (ws.writeFailed() && (_writeTimeout > 0) )
throw new InterruptedIOException("Timed out during write"); throw new InterruptedIOException("Timed out during write");
else if (ws.writeFailed()) else if (ws.writeFailed())
@ -117,6 +126,7 @@ public class MessageOutputStream extends OutputStream {
} }
public void close() throws IOException { public void close() throws IOException {
if (_closed) return;
_closed = true; _closed = true;
flush(); flush();
_log.debug("Output stream closed after writing " + _written); _log.debug("Output stream closed after writing " + _written);

18
apps/streaming/java/src/net/i2p/client/streaming/PacketLocal.java
View File

@ -117,14 +117,20 @@ public class PacketLocal extends Packet implements MessageOutputStream.WriteStat
public void waitForCompletion(int maxWaitMs) { public void waitForCompletion(int maxWaitMs) {
long expiration = _context.clock().now()+maxWaitMs; long expiration = _context.clock().now()+maxWaitMs;
while ((maxWaitMs <= 0) || (expiration < _context.clock().now())) { while (true) {
long timeRemaining = expiration - _context.clock().now();
if ( (timeRemaining <= 0) && (maxWaitMs > 0) ) return;
try {
synchronized (this) { synchronized (this) {
if (_ackOn > 0) if (_ackOn > 0) return;
return; if (_cancelledOn > 0) return;
if (_cancelledOn > 0) if (timeRemaining > 60*1000)
return; timeRemaining = 60*1000;
try { wait(); } catch (InterruptedException ie) {} else if (timeRemaining <= 0)
timeRemaining = 10*1000;
wait(timeRemaining);
} }
} catch (InterruptedException ie) {}
} }
} }