dandri/i2p.i2p
1
0
Fork 0
mirror of https://github.com/i2p/i2p.i2p.git synced 2026-06-07 08:51:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

* mark the input stream as closed after receiving the packet's data

Browse Source 
* properly close the source file in StreamSinkSend
* always adjust the rtt on ack, not just for packets with 1 send
* handle dup SYN gracefully
* revamp the default connection options
* logging
This commit is contained in:
jrandom
2004-10-25 20:04:07 +00:00
committed by zzz
parent 87898dd2f1
commit d592936873
8 changed files with 80 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/streaming/java/src/net/i2p/client/streaming/MessageInputStream.java
+35 -7
View File
@@ -51,6 +51,7 @@ public class MessageInputStream extends InputStream {
private boolean _locallyClosed;
private int _readTimeout;
private IOException _streamError;
private long _readTotal;
private Object _dataLock;
@@ -62,6 +63,7 @@ public class MessageInputStream extends InputStream {
_highestReadyBlockId = -1;
_highestBlockId = -1;
_readTimeout = -1;
_readTotal = 0;
_notYetReadyBlocks = new HashMap(4);
_dataLock = new Object();
_closeReceived = false;
@@ -149,9 +151,32 @@ public class MessageInputStream extends InputStream {
public void closeReceived() {
synchronized (_dataLock) {
if (_log.shouldLog(Log.DEBUG))
_log.debug("Close received, ready size: " + _readyDataBlocks.size()
+ " not ready: " + _notYetReadyBlocks.size(), new Exception("closed"));
if (_log.shouldLog(Log.DEBUG)) {
StringBuffer buf = new StringBuffer(128);
buf.append("Close received, ready bytes: ");
long available = 0;
for (int i = 0; i < _readyDataBlocks.size(); i++)
available += ((ByteArray)_readyDataBlocks.get(i)).getData().length;
available -= _readyDataBlockIndex;
buf.append(available);
buf.append(" blocks: ").append(_readyDataBlocks.size());
buf.append(" not ready blocks: ");
long notAvailable = 0;
for (Iterator iter = _notYetReadyBlocks.keySet().iterator(); iter.hasNext(); ) {
Long id = (Long)iter.next();
ByteArray ba = (ByteArray)_notYetReadyBlocks.get(id);
buf.append(id).append(" ");
if (ba.getData() != null)
notAvailable += ba.getData().length;
}
buf.append("not ready bytes: ").append(notAvailable);
buf.append(" highest ready block: ").append(_highestReadyBlockId);
_log.debug(buf.toString(), new Exception("closed"));
}
_closeReceived = true;
_dataLock.notifyAll();
}
@@ -182,15 +207,17 @@ public class MessageInputStream extends InputStream {
_readyDataBlocks.add(new ByteArray(payload));
}
_highestReadyBlockId = messageId;
long cur = _highestReadyBlockId + 1;
// now pull in any previously pending blocks
while (_notYetReadyBlocks.containsKey(new Long(_highestReadyBlockId + 1))) {
ByteArray ba = (ByteArray)_notYetReadyBlocks.get(new Long(_highestReadyBlockId + 1));
while (_notYetReadyBlocks.containsKey(new Long(cur))) {
ByteArray ba = (ByteArray)_notYetReadyBlocks.remove(new Long(cur));
if ( (ba != null) && (ba.getData() != null) && (ba.getData().length > 0) ) {
_readyDataBlocks.add(ba);
}
if (_log.shouldLog(Log.DEBUG))
_log.debug("making ready the block " + _highestReadyBlockId);
_log.debug("making ready the block " + cur);
cur++;
_highestReadyBlockId++;
}
_dataLock.notifyAll();
@@ -219,7 +246,7 @@ public class MessageInputStream extends InputStream {
if ( (_notYetReadyBlocks.size() <= 0) && (_closeReceived) ) {
if (_log.shouldLog(Log.DEBUG))
_log.debug("read() got EOF: " + toString());
_log.debug("read() got EOF after " + _readTotal + " " + toString());
return -1;
} else {
if (_readTimeout < 0) {
@@ -259,6 +286,7 @@ public class MessageInputStream extends InputStream {
_readyDataBlockIndex = 0;
_readyDataBlocks.remove(0);
}
_readTotal++;
return (rv < 0 ? rv + 256 : rv);
}
}