Skip to content

Commit

Permalink
stream: fix backpressure when multiple sync
Browse files Browse the repository at this point in the history
PR-URL: #19613
Fixes: #19601
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Trivikram Kamat <[email protected]>
Reviewed-By: Anna Henningsen <[email protected]>
  • Loading branch information
mcollina committed Mar 30, 2018
1 parent 6c5144f commit d37e59f
Show file tree
Hide file tree
Showing 2 changed files with 51 additions and 3 deletions.
15 changes: 12 additions & 3 deletions lib/_stream_readable.js
Original file line number Diff line number Diff line change
Expand Up @@ -310,8 +310,7 @@ function chunkInvalid(state, chunk) {
// 'readable' event will be triggered.
function needMoreData(state) {
return !state.ended &&
(state.needReadable ||
state.length < state.highWaterMark ||
(state.length < state.highWaterMark ||
state.length === 0);
}

Expand Down Expand Up @@ -536,7 +535,17 @@ function emitReadable_(stream) {
if (!state.destroyed && (state.length || state.ended)) {
stream.emit('readable');
}
state.needReadable = !state.flowing && !state.ended;

// The stream needs another readable event if
// 1. It is not flowing, as the flow mechanism will take
// care of it.
// 2. It is not ended.
// 3. It is below the highWaterMark, so we can schedule
// another readable later.
state.needReadable =
!state.flowing &&
!state.ended &&
state.length <= state.highWaterMark;
flow(stream);
}

Expand Down
39 changes: 39 additions & 0 deletions test/parallel/test-stream-backpressure.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
'use strict';

const common = require('../common');
const assert = require('assert');
const stream = require('stream');

let pushes = 0;
const total = 65500 + 40 * 1024;
const rs = new stream.Readable({
read: common.mustCall(function() {
if (pushes++ === 10) {
this.push(null);
return;
}

const length = this._readableState.length;

// We are at most doing two full runs of _reads
// before stopping, because Readable is greedy
// to keep its buffer full
assert(length <= total);

this.push(Buffer.alloc(65500));
for (let i = 0; i < 40; i++) {
this.push(Buffer.alloc(1024));
}

// We will be over highWaterMark at this point
// but a new call to _read is scheduled anyway.
}, 11)
});

const ws = stream.Writable({
write: common.mustCall(function(data, enc, cb) {
setImmediate(cb);
}, 41 * 10)
});

rs.pipe(ws);

0 comments on commit d37e59f

Please sign in to comment.