FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

http2: fix session memory tracking and small clean up by lundibundi · Pull Request #30351 · nodejs/node · GitHub

/ node Public

http2: fix session memory tracking and small clean up - #30351

Closed
lundibundi wants to merge 2 commits into
nodejs:masterfrom
lundibundi:fix-http2-read-memory-track
ConversationCommits (2)ChecksFiles changed
Closed

http2: fix session memory tracking and small clean up#30351
lundibundi wants to merge 2 commits into
nodejs:masterfrom
lundibundi:fix-http2-read-memory-track

Conversation

lundibundi commented Nov 10, 2019 •
edited
Loading

Copy link
Copy Markdown
Member
Checklist
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
  • tests and/or benchmarks are included
  • commit message follows commit guidelines

http2: fix session memory tracking with pending input data
Previously DecrementCurrentSessionMemory call was made after the relevant variable was reset to 0.

http2: small clean up in OnStreamRead
Extract pending input memory size in a variable and change code appropriately.

Not sure how to reliably hit the changed case, could someone help so I can write a test for DecrementCurrentSessionMemory?

lundibundi requested a review from addaleax November 10, 2019 12:36
nodejs-github-bot added c++ Issues and PRs that require attention from people who are familiar with C++. http2 Issues or PRs related to the http2 subsystem. labels Nov 10, 2019
lundibundi changed the title http2: fix read memory track and small clean up http2: fix session memory tracking and small clean up Nov 10, 2019
addaleax approved these changes Nov 10, 2019
View reviewed changes

addaleax left a comment

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.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

I guess if you want to write a test for this, you could build something based on test-http2-generic-streams.js that triggers this condition and takes a heap dump?

nodejs-github-bot commented Nov 16, 2019

Copy link
Copy Markdown
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/26630/

nodejs-github-bot commented Nov 17, 2019 •
edited by lundibundi
Loading

Copy link
Copy Markdown
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/26642/ ✔️

lundibundi added the author ready PRs that have at least one approval, no outstanding review comments, and a CI started. label Nov 17, 2019
lundibundi mentioned this pull request Nov 27, 2019
Closed
3 tasks
lundibundi added blocked PRs that are blocked by other issues or PRs. and removed author ready PRs that have at least one approval, no outstanding review comments, and a CI started. labels Nov 27, 2019

lundibundi commented Nov 29, 2019

Copy link
Copy Markdown
Member Author

Waiting for this #30684 to land. I'll then rebase and update this.

addaleax removed the blocked PRs that are blocked by other issues or PRs. label Nov 30, 2019
http2: small clean up in OnStreamRead
6e47a4b
http2: streamline OnStreamRead streamline memory accounting
542924e 
* avoid consecutive decrement/increment session memory calls.
* only Resize the buffer when it is needed.
* flip `stream_buf_offset_` condition to the LIKELY case.
lundibundi force-pushed the fix-http2-read-memory-track branch from d004aaf to 542924e Compare December 1, 2019 18:39

nodejs-github-bot commented Dec 1, 2019

Copy link
Copy Markdown
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/27255/

lundibundi commented Dec 1, 2019

Copy link
Copy Markdown
Member Author

@jasnell @addaleax @devnexen this got changed slightly, pinging to let you know.

nodejs-github-bot commented Dec 2, 2019

Copy link
Copy Markdown
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/27271/

lundibundi commented Dec 5, 2019

Copy link
Copy Markdown
Member Author

@jasnell @addaleax @devnexen could someone re-approve please? I consider this author ready, but don't want to have this landed until there is at least one approval of the new changes.
/cc @nodejs/http2

addaleax added the author ready PRs that have at least one approval, no outstanding review comments, and a CI started. label Dec 5, 2019
addaleax pushed a commit that referenced this pull request Dec 6, 2019
http2: small clean up in OnStreamRead
53fb7be 
PR-URL: #30351
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: David Carlier <devnexen@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
addaleax pushed a commit that referenced this pull request Dec 6, 2019
http2: streamline OnStreamRead streamline memory accounting
51ccf1b 
* avoid consecutive decrement/increment session memory calls.
* only Resize the buffer when it is needed.
* flip `stream_buf_offset_` condition to the LIKELY case.

PR-URL: #30351
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: David Carlier <devnexen@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>

addaleax commented Dec 6, 2019

Copy link
Copy Markdown
Member

Landed in bfd9de6...51ccf1b

addaleax closed this Dec 6, 2019
targos pushed a commit that referenced this pull request Dec 9, 2019
http2: small clean up in OnStreamRead
3840abe 
PR-URL: #30351
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: David Carlier <devnexen@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
targos pushed a commit that referenced this pull request Dec 9, 2019
http2: streamline OnStreamRead streamline memory accounting
71bb026 
* avoid consecutive decrement/increment session memory calls.
* only Resize the buffer when it is needed.
* flip `stream_buf_offset_` condition to the LIKELY case.

PR-URL: #30351
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: David Carlier <devnexen@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
MylesBorins mentioned this pull request Dec 13, 2019
Merged
targos pushed a commit that referenced this pull request Jan 13, 2020
http2: small clean up in OnStreamRead
a534058 
PR-URL: #30351
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: David Carlier <devnexen@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
targos pushed a commit that referenced this pull request Jan 13, 2020
http2: streamline OnStreamRead streamline memory accounting
f589f4d 
* avoid consecutive decrement/increment session memory calls.
* only Resize the buffer when it is needed.
* flip `stream_buf_offset_` condition to the LIKELY case.

PR-URL: #30351
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: David Carlier <devnexen@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
targos mentioned this pull request Jan 15, 2020
Closed
BethGriggs pushed a commit that referenced this pull request Feb 6, 2020
http2: small clean up in OnStreamRead
da9fffa 
PR-URL: #30351
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: David Carlier <devnexen@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
BethGriggs pushed a commit that referenced this pull request Feb 6, 2020
http2: streamline OnStreamRead streamline memory accounting
53c691c 
* avoid consecutive decrement/increment session memory calls.
* only Resize the buffer when it is needed.
* flip `stream_buf_offset_` condition to the LIKELY case.

PR-URL: #30351
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: David Carlier <devnexen@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
MylesBorins mentioned this pull request Feb 8, 2020
Merged
lundibundi added a commit to lundibundi/node that referenced this pull request Jul 22, 2020
http2: avoid unnecessary buffer resize
a343d35 
Refs: nodejs#34315
Refs: nodejs#30351
lundibundi mentioned this pull request Jul 22, 2020
Closed
4 tasks
mcollina pushed a commit that referenced this pull request Jul 27, 2020
http2: avoid unnecessary buffer resize
62198d2 
Refs: #34315
Refs: #30351

PR-URL: #34480
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: David Carlier <devnexen@gmail.com>
MylesBorins pushed a commit that referenced this pull request Jul 27, 2020
http2: avoid unnecessary buffer resize
098b193 
Refs: #34315
Refs: #30351

PR-URL: #34480
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: David Carlier <devnexen@gmail.com>
codebytere pushed a commit that referenced this pull request Nov 3, 2020
http2: avoid unnecessary buffer resize
8d8d2b4 
Refs: #34315
Refs: #30351

PR-URL: #34480
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: David Carlier <devnexen@gmail.com>
MylesBorins pushed a commit that referenced this pull request Nov 16, 2020
http2: avoid unnecessary buffer resize
c8a7789 
Refs: #34315
Refs: #30351

PR-URL: #34480
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: David Carlier <devnexen@gmail.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

jasnell jasnell approved these changes
addaleax addaleax approved these changes
+1 more reviewer
devnexen devnexen approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

author ready PRs that have at least one approval, no outstanding review comments, and a CI started. c++ Issues and PRs that require attention from people who are familiar with C++. http2 Issues or PRs related to the http2 subsystem.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

Back | FazBrowse Home | New Git URL