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

Streaming: More efficient copying in MessageInputStream

Browse Source 
Log tweaks
This commit is contained in:
zzz
2018-07-29 13:30:02 +00:00
parent b5ed39f10d
commit a51d260a78
1 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
apps/streaming/java/src/net/i2p/client/streaming/impl/MessageInputStream.java
View File

@ -265,7 +265,7 @@ class MessageInputStream extends InputStream {
*/ */
public void setReadTimeout(int timeout) { public void setReadTimeout(int timeout) {
if (_log.shouldLog(Log.DEBUG)) if (_log.shouldLog(Log.DEBUG))
_log.debug("Changing read timeout from " + _readTimeout + " to " + timeout); _log.debug("Changing read timeout from " + _readTimeout + " to " + timeout + ": " + hashCode());
_readTimeout = timeout; _readTimeout = timeout;
} }
@ -286,7 +286,7 @@ class MessageInputStream extends InputStream {
buf.append(available); buf.append(available);
buf.append(" blocks: ").append(_readyDataBlocks.size()); buf.append(" blocks: ").append(_readyDataBlocks.size());
buf.append(" not ready blocks: "); buf.append(" not ready blocks: [");
long notAvailable = 0; long notAvailable = 0;
for (Long id : _notYetReadyBlocks.keySet()) { for (Long id : _notYetReadyBlocks.keySet()) {
ByteArray ba = _notYetReadyBlocks.get(id); ByteArray ba = _notYetReadyBlocks.get(id);
@ -296,8 +296,9 @@ class MessageInputStream extends InputStream {
notAvailable += ba.getValid(); notAvailable += ba.getValid();
} }
buf.append("not ready bytes: ").append(notAvailable); buf.append("] not ready bytes: ").append(notAvailable);
buf.append(" highest ready block: ").append(_highestReadyBlockId); buf.append(" highest ready block: ").append(_highestReadyBlockId);
buf.append(" ID: ").append(hashCode());
_log.debug(buf.toString(), new Exception("Input stream closed")); _log.debug(buf.toString(), new Exception("Input stream closed"));
} }
@ -408,7 +409,8 @@ class MessageInputStream extends InputStream {
synchronized (_dataLock) { synchronized (_dataLock) {
if (_locallyClosed) throw new IOException("Input stream closed"); if (_locallyClosed) throw new IOException("Input stream closed");
throwAnyError(); throwAnyError();
for (int i = 0; i < length; i++) { int i = 0;
while (i < length) {
if ( (_readyDataBlocks.isEmpty()) && (i == 0) ) { if ( (_readyDataBlocks.isEmpty()) && (i == 0) ) {
// ok, we havent found anything, so lets block until we get // ok, we havent found anything, so lets block until we get
// at least one byte // at least one byte
@ -475,35 +477,33 @@ class MessageInputStream extends InputStream {
} }
} }
} }
// we looped a few times then got data, so this pass doesnt count
i--;
} else if (_readyDataBlocks.isEmpty()) { } else if (_readyDataBlocks.isEmpty()) {
if (shouldDebug) if (shouldDebug)
_log.debug("read(...," + offset+", " + length+ ")[" + i _log.debug("read(...," + offset+", " + length+ ")[" + i
+ "] no more ready blocks, returning"); + "] no more ready blocks, returning: " + hashCode());
return i; return i;
} else { } else {
// either was already ready, or we wait()ed and it arrived // either was already ready, or we wait()ed and it arrived
ByteArray cur = _readyDataBlocks.get(0); ByteArray cur = _readyDataBlocks.get(0);
byte rv = cur.getData()[cur.getOffset()+_readyDataBlockIndex]; int toRead = Math.min(cur.getValid() - _readyDataBlockIndex, length - i);
_readyDataBlockIndex++; System.arraycopy(cur.getData(), cur.getOffset() + _readyDataBlockIndex, target, offset + i, toRead);
_readyDataBlockIndex += toRead;
if (cur.getValid() <= _readyDataBlockIndex) { if (cur.getValid() <= _readyDataBlockIndex) {
_readyDataBlockIndex = 0; _readyDataBlockIndex = 0;
_readyDataBlocks.remove(0); _readyDataBlocks.remove(0);
} }
_readTotal++; _readTotal += toRead;
target[offset + i] = rv; // rv < 0 ? rv + 256 : rv if (shouldDebug) {
if ( (_readyDataBlockIndex <= 3) || (_readyDataBlockIndex >= cur.getValid() - 5) ) {
if (shouldDebug)
_log.debug("read(...," + offset+", " + length+ ")[" + i _log.debug("read(...," + offset+", " + length+ ")[" + i
+ "] after ready data: readyDataBlockIndex=" + _readyDataBlockIndex + "] copied " + toRead + " after ready data: readyDataBlockIndex=" + _readyDataBlockIndex
+ " readyBlocks=" + _readyDataBlocks.size() + " readyBlocks=" + _readyDataBlocks.size()
+ " readTotal=" + _readTotal); + " readTotal=" + _readTotal + ": " + hashCode());
} }
i += toRead;
//if (removed) //if (removed)
// _cache.release(cur); // _cache.release(cur);
} }
} // for (int i = 0; i < length; i++) { } // while (i < length) {
} // synchronized (_dataLock) } // synchronized (_dataLock)
if (shouldDebug) if (shouldDebug)
@ -527,7 +527,7 @@ class MessageInputStream extends InputStream {
} }
} }
if (_log.shouldLog(Log.DEBUG)) if (_log.shouldLog(Log.DEBUG))
_log.debug("available(): " + numBytes); _log.debug("available(): " + numBytes + ": " + hashCode());
return numBytes; return numBytes;
} }
@ -587,7 +587,7 @@ class MessageInputStream extends InputStream {
available -= _readyDataBlockIndex; available -= _readyDataBlockIndex;
buf.append(available); buf.append(available);
buf.append(" blocks: ").append(_readyDataBlocks.size()); buf.append(" blocks: ").append(_readyDataBlocks.size());
buf.append(" not ready blocks: "); buf.append(" not ready blocks: [");
long notAvailable = 0; long notAvailable = 0;
for (Long id : _notYetReadyBlocks.keySet()) { for (Long id : _notYetReadyBlocks.keySet()) {
ByteArray ba = _notYetReadyBlocks.get(id); ByteArray ba = _notYetReadyBlocks.get(id);
@ -595,8 +595,9 @@ class MessageInputStream extends InputStream {
if (ba != null) if (ba != null)
notAvailable += ba.getValid(); notAvailable += ba.getValid();
} }
buf.append("not ready bytes: ").append(notAvailable); buf.append("] not ready bytes: ").append(notAvailable);
buf.append(" highest ready block: ").append(_highestReadyBlockId); buf.append(" highest ready block: ").append(_highestReadyBlockId);
buf.append(" ID: ").append(hashCode());
_log.debug(buf.toString()); _log.debug(buf.toString());
} }
//while (_readyDataBlocks.size() > 0) //while (_readyDataBlocks.size() > 0)