Skip to content

fs: add WriteStream.prototype.flush #28519

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
himself65 wants to merge 6 commits into from
Closed

fs: add WriteStream.prototype.flush #28519

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c05197c
fs: add WriteStream.prototype.flush
himself65 Jul 6, 2019
41192c5
test: add tests for WriteStream.prototype.flush
himself65 Jul 6, 2019
cf2e987
fixup!
himself65 Jul 8, 2019
dca0340
fixup!
himself65 Jul 8, 2019
027dc23
fixup!
himself65 Jul 8, 2019
4d6b641
fixup!
himself65 Jul 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
fixup!
  • Loading branch information
@himself65
himself65 committed Jul 12, 2019
commit 4d6b6410370e3e362aec068b131e6f5d31f65f4c
27 changes: 21 additions & 6 deletions lib/_stream_writable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,12 +385,20 @@ function writeOrBuffer(stream, state, isBuf, chunk, encoding, cb) {
state.needDrain = true;

if (state.writing || state.corked) {
pushBufferedRequest(state, {
const last = state.lastBufferedRequest;
state.lastBufferedRequest = {
next: null,
chunk,
encoding,
isBuf,
callback: cb
});
};
if (last) {
last.next = state.lastBufferedRequest;
} else {
state.bufferedRequest = state.lastBufferedRequest;
}
state.bufferedRequestCount += 1;
} else {
doWrite(stream, state, false, len, chunk, encoding, cb);
}
Expand Down Expand Up @@ -514,9 +522,9 @@ function clearBuffer(stream, state) {
flushCallback = entry.callback;
} else {
length += entry.chunk.length;
count += 1;
}
entry = entry.next;
count += 1;
}
buffer.allBuffers = allBuffers;
doWrite(stream, state, true, length, buffer, '', holder.finish);
Expand Down Expand Up @@ -549,9 +557,9 @@ function clearBuffer(stream, state) {
stream._flush(cb);
} else {
doWrite(stream, state, false, len, chunk, encoding, cb);
state.bufferedRequestCount--;
}
entry = entry.next;
state.bufferedRequestCount--;
// If we didn't call the onwrite immediately, then
// it means that we need to wait until it does.
// also, that means that the chunk and cb are currently
Expand Down Expand Up @@ -607,10 +615,17 @@ Writable.prototype.flush = function(cb) {
if (arguments.length > 0 && typeof cb !== 'function') {
ERR_INVALID_CALLBACK(cb);
}
pushBufferedRequest(this._writableState, {
const last = state.lastBufferedRequest;
state.lastBufferedRequest = {
next: null,
isFlush: true,
callback: cb
});
};
if (last) {
last.next = state.lastBufferedRequest;
} else {
state.bufferedRequest = state.lastBufferedRequest;
}
};

Object.defineProperty(Writable.prototype, 'writableLength', {
Expand Down