Skip to content

Commit

Permalink
stream: avoid unnecessary drain for sync stream
Browse files Browse the repository at this point in the history
PR-URL: #50014
  • Loading branch information
ronag committed Oct 3, 2023
1 parent 85c09f1 commit 980032d
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 9 deletions.
7 changes: 6 additions & 1 deletion lib/internal/streams/transform.js
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,12 @@ Transform.prototype._write = function(chunk, encoding, callback) {
this.push(val);
}

if (
if (rState.ended) {
// If user has called this.push(null) we have to
// delay the callback to properly progate the new
// state.
process.nextTick(callback);
} else if (
wState.ended || // Backwards compat.
length === rState.length || // Backwards compat.
rState.length < rState.highWaterMark
Expand Down
16 changes: 8 additions & 8 deletions lib/internal/streams/writable.js
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ const kWriteCb = 1 << 26;
const kExpectWriteCb = 1 << 27;
const kAfterWriteTickInfo = 1 << 28;
const kAfterWritePending = 1 << 29;
const kIsDuplex = 1 << 30;

// TODO(benjamingr) it is likely slower to do it this way than with free functions
function makeBitMapDescriptor(bit) {
Expand Down Expand Up @@ -286,6 +287,7 @@ function WritableState(options, stream, isDuplex) {

if (options && options.objectMode) this.state |= kObjectMode;
if (isDuplex && options && options.writableObjectMode) this.state |= kObjectMode;
if (isDuplex) this.state |= kIsDuplex;

// The point at which write() starts returning false
// Note: 0 is a valid value, means that we always return false if
Expand Down Expand Up @@ -513,14 +515,6 @@ function writeOrBuffer(stream, state, chunk, encoding, callback) {

state.length += len;

// stream._write resets state.length
const ret = state.length < state.highWaterMark;

// We must ensure that previous needDrain will not be reset to false.
if (!ret) {
state.state |= kNeedDrain;
}

if ((state.state & (kWriting | kErrored | kCorked | kConstructed)) !== kConstructed) {
state.buffered.push({ chunk, encoding, callback });
if ((state.state & kAllBuffers) !== 0 && encoding !== 'buffer') {
Expand All @@ -539,6 +533,12 @@ function writeOrBuffer(stream, state, chunk, encoding, callback) {
state.state &= ~kSync;
}

const ret = state.length < state.highWaterMark;

if (!ret) {
state.state |= kNeedDrain;
}

// Return false if errored or destroyed in order to break
// any synchronous while(stream.write(data)) loops.
return ret && (state.state & (kDestroyed | kErrored)) === 0;
Expand Down

0 comments on commit 980032d

Please sign in to comment.