Skip to content

http2: add Http2Stream.bufferSize - #23711

Closed
oyyd wants to merge 2 commits into
nodejs:masterfrom
oyyd:http2-stream-buffersize
Closed

http2: add Http2Stream.bufferSize#23711
oyyd wants to merge 2 commits into
nodejs:masterfrom
oyyd:http2-stream-buffersize

Conversation

@oyyd

@oyydoyyd commented Oct 17, 2018

Copy link
Copy Markdown
Contributor

This commit adds bufferSize for Http2Stream.

Refs: #21631

/cc @jasnell@addaleax@apapirovski

From the code, I believe the writeQueueSize in http2 module could represent the kLastWriteQueueSize in net module:

returnthis[kLastWriteQueueSize]+this.writableLength;

and the tests following this PR seems okay. Can you help to confirm that?

BTW, we can add Http2Session.bufferSize basing on this which is what #21631 exactly requested.

Checklist
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
  • tests and/or benchmarks are included
  • documentation is changed or added
  • commit message follows commit guidelines

@nodejs-github-botnodejs-github-bot added dont-land-on-v6.x http2 Issues or PRs related to the http2 subsystem. labels Oct 17, 2018
This commit adds `bufferSize` for `Http2Stream`.
Refs: nodejs#21631
@oyyd
oyydforce-pushed the http2-stream-buffersize branch from f2264e6 to d7d9307CompareOctober 17, 2018 12:39
get bufferSize() {
// `bufferSize` properties of `net.Socket` are `undefined` when
// their `_handle` are falsy. Here we avoid the behavior.
return this[kState].writeQueueSize + this.writableLength;

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

At best this is likely an approximation with a high degree of accuracy at any given time. It's likely good enough :-)

What do you think @addaleax?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I’d guess it’s good enough, yes :)

@jasnelljasnell added the semver-minor PRs that contain new features and should be released in the next minor version. label Oct 17, 2018
Comment threaddoc/api/http2.md Outdated
Set to `true` if the `Http2Stream` instance was aborted abnormally. When set,
the `'aborted'` event will have been emitted.

### http2stream.bufferSize

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit:

Suggested change
### http2stream.bufferSize
####http2stream.bufferSize

Comment threaddoc/api/http2.md Outdated
[`net.Socket.prototype.ref()`]: net.html#net_socket_ref
[`net.Socket.prototype.unref()`]: net.html#net_socket_unref
[`net.connect()`]: net.html#net_net_connect
[`net.Socket.bufferSize`]: net.html#net_socket_buffersize

@vsemozhetbytvsemozhetbytOct 17, 2018

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: should go after [`net.Socket`]: net.html#net_class_net_socket (in ASCII sort order).

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! Done.

@BridgeAR

Copy link
Copy Markdown
Member

@oyyd

oyyd commented Oct 20, 2018

Copy link
Copy Markdown
ContributorAuthor

The test, parallel/test-tls-alert-handling, failed seems unrelated.

@lundibundi

lundibundi commented Oct 20, 2018

Copy link
Copy Markdown
Member

Trott pushed a commit to Trott/io.js that referenced this pull request Nov 6, 2018
This commit adds `bufferSize` for `Http2Stream`.
Refs: nodejs#21631
PR-URL: nodejs#23711
Reviewed-By: James M Snell <jasnell@gmail.com>
@Trott

Trott commented Nov 6, 2018

Copy link
Copy Markdown
Member

Landed in 33fbb93

@TrottTrott closed this Nov 6, 2018
targos pushed a commit that referenced this pull request Nov 6, 2018
This commit adds `bufferSize` for `Http2Stream`.
Refs: #21631
PR-URL: #23711
Reviewed-By: James M Snell <jasnell@gmail.com>
@BridgeARBridgeAR mentioned this pull request Nov 14, 2018
BethGriggs pushed a commit that referenced this pull request Apr 8, 2019
This commit adds `bufferSize` for `Http2Stream`.
Refs: #21631
PR-URL: #23711
Reviewed-By: James M Snell <jasnell@gmail.com>
@BethGriggsBethGriggs mentioned this pull request May 1, 2019
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

http2Issues or PRs related to the http2 subsystem.semver-minorPRs that contain new features and should be released in the next minor version.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants

@oyyd@BridgeAR@lundibundi@Trott@jasnell@addaleax@vsemozhetbyt@nodejs-github-bot