stream: Always defer preemptive reading to improve latency

1 files changed, 10 insertions, 6 deletions

diff --git a/lib/_stream_readable.js b/lib/_stream_readable.js
index c4405314a4..d6ef327a8a 100644
--- a/lib/_stream_readable.js
+++ b/lib/_stream_readable.js
@@ -72,6 +72,9 @@ function ReadableState(options, stream) {
   // the number of writers that are awaiting a drain event in .pipe()s
   this.awaitDrain = 0;
 
+  // if true, a maybeReadMore has been scheduled
+  this.readingMore = false;
+
   this.decoder = null;
   if (options.encoding) {
     if (!StringDecoder)
@@ -378,18 +381,19 @@ function emitReadable_(stream) {
 // in turn another _read(n) call, in which case reading = true if
 // it's in progress.
 // However, if we're not ended, or reading, and the length < hwm,
-// then go ahead and try to read some more right now preemptively.
+// then go ahead and try to read some more preemptively.
 function maybeReadMore(stream, state) {
-  if (state.sync)
+  if (!state.readingMore) {
+    state.readingMore = true;
     process.nextTick(function() {
+      state.readingMore = false;
       maybeReadMore_(stream, state);
     });
-  else
-    maybeReadMore_(stream, state);
+  }
 }
 
 function maybeReadMore_(stream, state) {
-  if (!state.reading && !state.ended &&
+  if (!state.reading && !state.flowing && !state.ended &&
       state.length < state.highWaterMark) {
     stream.read(0);
   }
@@ -636,7 +640,7 @@ Readable.prototype.on = function(ev, fn) {
   if (ev === 'data' && !this._readableState.flowing)
     emitDataEvents(this);
 
-  if (ev === 'readable')
+  if (ev === 'readable' && !this._readableState.reading)
     this.read(0);
 
   return res;