async_wrap,src: wrap promises directly #13224
Closed
Conversation
This file contains 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
added 2 commits
May 25, 2017 10:50
Original commit message: Allow embedder to set promise internal field count Asynchronous context tracking mechanisms in Node.js need to store some state on all promise objects. This change will allow embedders to configure the number of internal fields on promises as is already done for ArrayBuffers. BUG=v8:6435 Review-Url: https://codereview.chromium.org/2889863002 Cr-Commit-Position: refs/heads/master@{#45496}
Promises do not have any internal fields by default. V8 recently added the capability of configuring the number of internal fields on promises. This change adds an internal field to promises allowing promises to be wrapped directly by the PromiseWrap object. In addition to cleaner code this avoids an extra object allocation per promise and speeds up promise creation with async_hooks enabled by ~2x.
nodejs-github-bot
added
async_wrap
build
addaleax
previously approved these changes
May 25, 2017
addaleax
reviewed
May 25, 2017
| env->promise_async_tag(), | ||
| obj, hidden).FromJust(); | ||
| PromiseWrap* wrap = new PromiseWrap(env, promise); | ||
| promise->SetAlignedPointerInInternalField(0, wrap); |
There was a problem hiding this comment.
Wait… doesn’t this leak the PromiseWrap memory? V8 doesn’t know that this is a pointer to something it can/should garbage collect. I think promise->SetInternalField(0, wrap->object()); should work?
AndreasMadsen
approved these changes
May 25, 2017
addaleax
reviewed
May 25, 2017
| promise->DefineOwnProperty(context, | ||
| env->promise_async_tag(), | ||
| obj, hidden).FromJust(); | ||
| PromiseWrap* wrap = new PromiseWrap(env, promise); |
There was a problem hiding this comment.
This makes the resource that the init callback sees the Promise itself, right? /cc @Fishrock123
|
@matthewloring This should be enough to close the memory leak: diff --git a/src/async-wrap.cc b/src/async-wrap.cc
index 4a210741bedc..b1f651c12d8d 100644
--- a/src/async-wrap.cc
+++ b/src/async-wrap.cc
@@ -282,12 +282,11 @@ static void PromiseHook(PromiseHookType type, Local<Promise> promise,
Environment* env = Environment::GetCurrent(context);
if (type == PromiseHookType::kInit) {
PromiseWrap* wrap = new PromiseWrap(env, promise);
- promise->SetAlignedPointerInInternalField(0, wrap);
+ wrap->MakeWeak(wrap);
} else if (type == PromiseHookType::kResolve) {
// TODO(matthewloring): need to expose this through the async hooks api.
}
- PromiseWrap* wrap =
- static_cast<PromiseWrap*>(promise->GetAlignedPointerFromInternalField(0));
+ PromiseWrap* wrap = Unwrap<PromiseWrap>(promise);
CHECK_NE(wrap, nullptr);
if (type == PromiseHookType::kBefore) {
PreCallbackExecution(wrap, false); |
3 tasks
27 tasks
|
@addaleax @matthewloring anything holding us back from applying the memory fix and merging this? |
|
I guess it technically violates the 72-hour rule, but as mentioned in #13242 (comment) I would be okay with merging this (or both PRs) now. |
|
I see. This is on the |
|
Landed in 849f223 |
addaleax
pushed a commit
that referenced
this pull request
May 28, 2017
Promises do not have any internal fields by default. V8 recently added the capability of configuring the number of internal fields on promises. This change adds an internal field to promises allowing promises to be wrapped directly by the PromiseWrap object. In addition to cleaner code this avoids an extra object allocation per promise and speeds up promise creation with async_hooks enabled by ~2x. PR-URL: #13242 Ref: #13224 Reviewed-By: Andreas Madsen <[email protected]> Reviewed-By: Anna Henningsen <[email protected]>
jasnell
pushed a commit
that referenced
this pull request
May 28, 2017
Promises do not have any internal fields by default. V8 recently added the capability of configuring the number of internal fields on promises. This change adds an internal field to promises allowing promises to be wrapped directly by the PromiseWrap object. In addition to cleaner code this avoids an extra object allocation per promise and speeds up promise creation with async_hooks enabled by ~2x. PR-URL: #13242 Ref: #13224 Reviewed-By: Andreas Madsen <[email protected]> Reviewed-By: Anna Henningsen <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Promises do not have any internal fields by default. V8 recently added
the capability of configuring the number of internal fields on promises.
This change adds an internal field to promises allowing promises to be
wrapped directly by the PromiseWrap object. In addition to cleaner code
this avoids an extra object allocation per promise and speeds up promise
creation with async_hooks enabled by ~2x.
Checklist
make -j4 test(UNIX), orvcbuild test(Windows) passesAffected core subsystem(s)
async_wrap, src