1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

streams2: Allow 0 as a lowWaterMark value

Browse Source
This commit is contained in:
isaacs 2012-10-05 07:43:34 -07:00
parent caa853bb06
commit 02f017d24f
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/_stream_readable.js
View File

@ -36,7 +36,8 @@ function ReadableState(options, stream) {
// cast to an int // cast to an int
this.bufferSize = ~~this.bufferSize; this.bufferSize = ~~this.bufferSize;
this.lowWaterMark = options.lowWaterMark || 1024; this.lowWaterMark = options.hasOwnProperty('lowWaterMark') ?
options.lowWaterMark : 1024;
this.buffer = []; this.buffer = [];
this.length = 0; this.length = 0;
this.pipes = []; this.pipes = [];
@ -94,7 +95,7 @@ Readable.prototype.read = function(n) {
// but then it won't ever cause _read to be called, so in that case, // but then it won't ever cause _read to be called, so in that case,
// we just return what we have, and let the programmer deal with it. // we just return what we have, and let the programmer deal with it.
if (n > state.length) { if (n > state.length) {
if (!state.ended && state.length < state.lowWaterMark) { if (!state.ended && state.length <= state.lowWaterMark) {
state.needReadable = true; state.needReadable = true;
n = 0; n = 0;
} else } else
@ -114,7 +115,7 @@ Readable.prototype.read = function(n) {
state.length -= n; state.length -= n;
if (!state.ended && if (!state.ended &&
state.length < state.lowWaterMark && state.length <= state.lowWaterMark &&
!state.reading) { !state.reading) {
state.reading = true; state.reading = true;
// call internal read method // call internal read method
@ -145,7 +146,7 @@ Readable.prototype.read = function(n) {
// that it's time to read more data. Otherwise, that'll // that it's time to read more data. Otherwise, that'll
// probably kick off another stream.read(), which can trigger // probably kick off another stream.read(), which can trigger
// another _read(n,cb) before this one returns! // another _read(n,cb) before this one returns!
if (state.length < state.lowWaterMark) { if (state.length <= state.lowWaterMark) {
state.reading = true; state.reading = true;
this._read(state.bufferSize, onread.bind(this)); this._read(state.bufferSize, onread.bind(this));
return; return;
@ -398,7 +399,7 @@ Readable.prototype.wrap = function(stream) {
var ret = fromList(n, state.buffer, state.length, !!state.decoder); var ret = fromList(n, state.buffer, state.length, !!state.decoder);
state.length -= n; state.length -= n;
if (state.length < state.lowWaterMark && paused) { if (state.length <= state.lowWaterMark && paused) {
stream.resume(); stream.resume();
paused = false; paused = false;
} }

7
lib/_stream_writable.js
View File

@ -33,7 +33,10 @@ util.inherits(Writable, Stream);
function WritableState(options) { function WritableState(options) {
options = options || {}; options = options || {};
this.highWaterMark = options.highWaterMark || 16 * 1024; this.highWaterMark = options.highWaterMark || 16 * 1024;
this.lowWaterMark = options.lowWaterMark || 1024; this.highWaterMark = options.hasOwnProperty('highWaterMark') ?
options.highWaterMark : 16 * 1024;
this.lowWaterMark = options.hasOwnProperty('lowWaterMark') ?
options.lowWaterMark : 1024;
this.needDrain = false; this.needDrain = false;
this.ended = false; this.ended = false;
this.ending = false; this.ending = false;
@ -103,7 +106,7 @@ Writable.prototype.write = function(chunk, encoding) {
this._write(chunk, writecb.bind(this)); this._write(chunk, writecb.bind(this));
} }
if (state.length < state.lowWaterMark && state.needDrain) { if (state.length <= state.lowWaterMark && state.needDrain) {
// Must force callback to be called on nextTick, so that we don't // Must force callback to be called on nextTick, so that we don't
// emit 'drain' before the write() consumer gets the 'false' return // emit 'drain' before the write() consumer gets the 'false' return
// value, and has a chance to attach a 'drain' listener. // value, and has a chance to attach a 'drain' listener.