AfflictionNetworks/narya
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make readAvailable() non-recursive.

Browse Source 
Thane apparently has a maximum stack depth of 64, and this is quickly getting eaten up by readAvailable() when lots of frames are sent down the tubes simultaneously. (mxmlc doesn't seem to optimize tail-recursive functions.)


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5360 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Tom Conkling
2008-09-05 00:30:19 +00:00
parent d5546a37fb
commit ca8abbaf62
1 changed files with 25 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/as/com/threerings/io/FrameReader.as
+25 -35
View File
@@ -62,45 +62,35 @@ public class FrameReader extends EventDispatcher
Log.getLog(this).debug( Log.getLog(this).debug(
"socketHasData(" + _socket.bytesAvailable + ")"); "socketHasData(" + _socket.bytesAvailable + ")");
} }
if (_curData == null) {
if (_socket.bytesAvailable < HEADER_SIZE) { while (_socket.bytesAvailable >= HEADER_SIZE) {
// if there are less bytes available than a header, let's if (_curData == null) {
// just leave them on the socket until we can read the length // the length specified is the length of the entire frame,
// all at once // including the length of the bytes used to encode the length.
return; // (I think this is pretty silly).
// So for our purposes we subtract 4 bytes so we know how much
// more data is in the frame.
_length = _socket.readInt() - HEADER_SIZE;
_curData = new ByteArray();
_curData.endian = Endian.BIG_ENDIAN;
} }
// the length specified is the length of the entire frame,
// including the length of the bytes used to encode the length.
// (I think this is pretty silly).
// So for our purposes we subtract 4 bytes so we know how much
// more data is in the frame.
_length = _socket.readInt() - HEADER_SIZE;
_curData = new ByteArray();
_curData.endian = Endian.BIG_ENDIAN;
}
// read bytes: either as much as possible or up to the end of the frame // read bytes: either as much as possible or up to the end of the frame
var toRead :int = Math.min(_length - _curData.length, var toRead :int = Math.min(_length - _curData.length, _socket.bytesAvailable);
_socket.bytesAvailable); // Just in case, if the amount needed is 0, don't do anything!
// Just in case, if the amount needed is 0, don't do anything! // Passing 0 causes it to read *all available bytes*.
// Passing 0 causes it to read *all available bytes*. if (toRead != 0) {
if (toRead != 0) { _socket.readBytes(_curData, _curData.length, toRead);
_socket.readBytes(_curData, _curData.length, toRead);
}
if (_length === _curData.length) {
// we have now read a complete frame, let us dispatch the data
_curData.position = 0; // move the read pointer to the beginning
if (ObjectInputStream.DEBUG) {
Log.getLog(this).debug("+ FrameAvailable");
} }
dispatchEvent(new FrameAvailableEvent(_curData));
_curData = null; // clear, so we know we need to first read length
// there's a good chance there's more on the socket, recurse if (_length === _curData.length) {
// now to read it // we have now read a complete frame, let us dispatch the data
if (_socket.bytesAvailable >= HEADER_SIZE) { _curData.position = 0; // move the read pointer to the beginning
readAvailable(); if (ObjectInputStream.DEBUG) {
Log.getLog(this).debug("+ FrameAvailable");
}
dispatchEvent(new FrameAvailableEvent(_curData));
_curData = null; // clear, so we know we need to first read length
} }
} }
} }