stream: simplify howMuchToRead()

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: #29155 Reviewed-By: Matteo Collina <[email protected]> Reviewed-By: Rich Trott <[email protected]>
nodejs · Aug 20, 2019 · 1e3e6da · 1e3e6da
1 parent 17319e7
commit 1e3e6da
Showing 1 changed file with 5 additions and 9 deletions.
diff --git a/lib/_stream_readable.js b/lib/_stream_readable.js
@@ -377,17 +377,9 @@ function howMuchToRead(n, state) {
     else
       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)
     return n;
-  // Don't have enough
-  if (!state.ended) {
-    state.needReadable = true;
-    return 0;
-  }
-  return state.length;
+  return state.ended ? state.length : 0;
 }
 
 // You can override either this method, or the async _read(n) below.
@@ -403,6 +395,10 @@ Readable.prototype.read = function(n) {
   const state = this._readableState;
   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)
     state.emittedReadable = false;