Skip to content

Merge http2 stream & net socket #19527

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
aks- wants to merge 14 commits into from
Closed

Merge http2 stream & net socket #19527

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
b037232
lib: merge stream handling code for http2 streams & net.Socket
aks- Mar 18, 2018
efa0f4f
lib: separate writev responsibilities from writeGeneric
aks- Mar 21, 2018
19aedde
lib: fix calling of cb twice
aks- Mar 21, 2018
5c8eb75
lib: extract streamId out of stream_base to caller
aks- Mar 22, 2018
92e4f71
lib: add symbols instead of methods to hide impl details
aks- Mar 22, 2018
babe858
lib: remove unneeded lines
aks- Mar 23, 2018
27818c4
lib: use Object.assign instead of apply
aks- Mar 23, 2018
0144de4
lib: rename mixin StreamBase to StreamSharedMethods
aks- Mar 23, 2018
e4365d6
lib: use stream shared funcs as top level instead of properties of pr…
aks- Mar 23, 2018
560635d
lib: mv lib/internal/stream_shared_methods.js lib/internal/stream_bas…
aks- Mar 23, 2018
833c52a
lib: add comment for readability
aks- Mar 23, 2018
fcfd8d3
lib: refactor _writev in Http2Stream
aks- Mar 23, 2018
43b912d
lib: rephrase comment
aks- Mar 24, 2018
5055714
lib: revert usage of const,let for perf reasons
aks- Mar 26, 2018
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
Next Next commit
lib: separate writev responsibilities from writeGeneric
  • Loading branch information
@aks-
aks- committed Mar 23, 2018
commit efa0f4f81d907a9e3ae09d9185ac9297bfbbf385
2 changes: 1 addition & 1 deletion lib/internal/http2/core.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1654,7 +1654,7 @@ class Http2Stream extends Duplex {
const req = new WriteWrap();
req.callback = cb;
this.createWriteWrap(req, streamId, handle, afterDoStreamWrite);
this.writeGeneric(req, null, data, encoding, cb);
this.writeGeneric(req, data, encoding, cb);

trackWriteState(this, req.bytes);
}
Expand Down
52 changes: 28 additions & 24 deletions lib/internal/streams/stream_base.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,33 +15,37 @@ const StreamBaseMethods = {
req.async = false;
},

writeGeneric(req, writev, data, encoding, cb) {
const { handle, error } = req;
let err;

if (writev) {
const allBuffers = data.allBuffers;
let chunks;
let i;
if (allBuffers) {
chunks = data;
for (i = 0; i < data.length; i++)
data[i] = data[i].chunk;
} else {
chunks = new Array(data.length << 1);
for (i = 0; i < data.length; i++) {
const entry = data[i];
chunks[i * 2] = entry.chunk;
chunks[i * 2 + 1] = entry.encoding;
}
writevGeneric(req, data, cb) {
const { error } = req;
const allBuffers = data.allBuffers;
let chunks;
let i;
if (allBuffers) {
chunks = data;
for (i = 0; i < data.length; i++)
data[i] = data[i].chunk;
} else {
chunks = new Array(data.length << 1);
for (i = 0; i < data.length; i++) {
const entry = data[i];
chunks[i * 2] = entry.chunk;
chunks[i * 2 + 1] = entry.encoding;
}
err = this._handle.writev(req, chunks, allBuffers);
}
const err = this._handle.writev(req, chunks, allBuffers);

// Retain chunks
if (err === 0) req._chunks = chunks;
} else {
err = this._handleWriteReq(req, handle, data, encoding);
// Retain chunks
if (err === 0) req._chunks = chunks;

if (err) {
return this.destroy(errnoException(err, 'write', error), cb);
}
},

writeGeneric(req, data, encoding, cb) {
const { handle, error } = req;

const err = this._handleWriteReq(req, handle, data, encoding);

if (err) {
return this.destroy(errnoException(err, 'write', error), cb);
Expand Down
3 changes: 2 additions & 1 deletion lib/net.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -745,7 +745,8 @@ Socket.prototype._writeGeneric = function(writev, data, encoding, cb) {
const req = new WriteWrap();
const handle = this._handle;
this.createWriteWrap(req, null, handle, afterWrite);
this.writeGeneric(req, writev, data, encoding, cb);
if (writev) this.writevGeneric(req, data, cb);
else this.writeGeneric(req, data, encoding, cb);

this._bytesDispatched += req.bytes;

Expand Down