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

stream: simplify howMuchToRead()

Browse Source 
This slightly refactors read by moving side effects out of
howMuchToRead().

We don't actually have to set state.needReadable = true; in
howMuchToRead() since read handles 0 return as needReadable.

PR-URL: https://github.com/nodejs/node/pull/29155
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
This commit is contained in:
Robert Nagy 2019-08-16 10:16:23 +02:00 committed by Rich Trott
parent cc7cec25c5
commit ea765eba20
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/_stream_readable.js
View File

@ -386,17 +386,9 @@ function howMuchToRead(n, state) {
else else
return state.length; return state.length;
} }
// If we're asking for more than the current hwm, then raise the hwm.
if (n > state.highWaterMark)
state.highWaterMark = computeNewHighWaterMark(n);
if (n <= state.length) if (n <= state.length)
return n; return n;
// Don't have enough return state.ended ? state.length : 0;
if (!state.ended) {
state.needReadable = true;
return 0;
}
return state.length;
} }
// You can override either this method, or the async _read(n) below. // You can override either this method, or the async _read(n) below.
@ -412,6 +404,10 @@ Readable.prototype.read = function(n) {
const state = this._readableState; const state = this._readableState;
const nOrig = n; const nOrig = n;
// If we're asking for more than the current hwm, then raise the hwm.
if (n > state.highWaterMark)
state.highWaterMark = computeNewHighWaterMark(n);
if (n !== 0) if (n !== 0)
state.emittedReadable = false; state.emittedReadable = false;