Skip to content
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

Jump to bottom

src: fix external memory usage going negative #22594

Closed
wants to merge 3 commits into from
Closed

src: fix external memory usage going negative #22594

wants to merge 3 commits into from

Conversation

mafintosh
Copy link
Member

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

Fixes a bug introduced in d7cba76 that decrements the external memory twice when using SSL connections (Reset is called both during destructuring and in Close).
This in turn made process.memoryUsage().external report negative numbers.

Added a test as well.
Fixes #21570

@nodejs-github-bot
Copy link
Collaborator

@mafintosh build started: https://ci.nodejs.org/blue/organizations/jenkins/node-test-pull-request-lite-pipeline/detail/node-test-pull-request-lite-pipeline/728/pipeline

@nodejs-github-bot nodejs-github-bot added c++ Issues and PRs that require attention from people who are familiar with C++. crypto Issues and PRs related to the crypto subsystem. labels Aug 30, 2018
@mafintosh mafintosh force-pushed the fix-negative-external-memory-usage branch from f8c6a8a to d783377 Compare August 30, 2018 01:32
@mafintosh mafintosh mentioned this pull request Aug 30, 2018
Closed
@mafintosh mafintosh changed the title src: fix double external memory usage going negative src: fix external memory usage going negative Aug 30, 2018
TimothyGu
TimothyGu approved these changes Aug 30, 2018
View reviewed changes
src/node_crypto.h Outdated
@@ -198,7 +198,9 @@ class SecureContext : public BaseObject {
}

inline void Reset() {
env()->isolate()->AdjustAmountOfExternalAllocatedMemory(-kExternalSize);
if (ctx_.get() != nullptr) {
Copy link
Member

Choose a reason for hiding this comment

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

nit: just if (ctx_) should be enough.

cjihrig
cjihrig approved these changes Aug 30, 2018
View reviewed changes
test/parallel/test-gc-tls-external-memory.js Outdated
socket.write(yolo);
});

server.listen(0, function() {
Copy link
Contributor

Choose a reason for hiding this comment

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

Please add common.mustCall() to the callback.

@BridgeAR BridgeAR added the author ready PRs that have at least one approval, no pending requests for changes, and a CI started. label Aug 31, 2018
@BridgeAR
Copy link
Member

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

@addaleax
Copy link
Member

addaleax commented Sep 2, 2018

Landed in 1287e52

@addaleax addaleax closed this Sep 2, 2018
addaleax pushed a commit that referenced this pull request Sep 2, 2018
@mafintosh @addaleax
src: fix external memory usage going negative
1287e52 
PR-URL: #22594
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Tiancheng "Timothy" Gu <timothygu99@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
targos pushed a commit that referenced this pull request Sep 2, 2018
@mafintosh @targos
src: fix external memory usage going negative
6b7cc49 
PR-URL: #22594
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Tiancheng "Timothy" Gu <timothygu99@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
targos pushed a commit that referenced this pull request Sep 3, 2018
@mafintosh @targos
src: fix external memory usage going negative
75a9192 
PR-URL: #22594
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Tiancheng "Timothy" Gu <timothygu99@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
@targos targos mentioned this pull request Sep 5, 2018
Merged
targos pushed a commit that referenced this pull request Sep 6, 2018
@mafintosh @targos
src: fix external memory usage going negative
f918e36 
PR-URL: #22594
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Tiancheng "Timothy" Gu <timothygu99@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
This was referenced Sep 6, 2018
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jasnell jasnell jasnell approved these changes

@addaleax addaleax addaleax approved these changes

@TimothyGu TimothyGu TimothyGu approved these changes

@cjihrig cjihrig cjihrig approved these changes

@tniessen tniessen tniessen approved these changes

@Oliyy Oliyy Oliyy approved these changes

Assignees
No one assigned
Labels
author ready PRs that have at least one approval, no pending requests for changes, and a CI started. c++ Issues and PRs that require attention from people who are familiar with C++. crypto Issues and PRs related to the crypto subsystem.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Memory usage (external) reports a negative value?
9 participants
@mafintosh @nodejs-github-bot @BridgeAR @addaleax @jasnell @TimothyGu @cjihrig @tniessen @Oliyy