Skip to content

src: set PromiseHooks by Environment #38821

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
bengl wants to merge 8 commits into from
Closed

src: set PromiseHooks by Environment #38821

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7986a9b
src: set PromiseHooks by Environment
bengl May 26, 2021
bb55976
fixup! switch to weak globals
bengl May 27, 2021
0f4342b
fixup! switch to weak globals for hook functions
bengl May 27, 2021
d1667ad
fixup! Revert "fixup! switch to weak globals for hook functions"
bengl May 28, 2021
d3ec54a
fixup! switch accidental strong ref, and use handle scopes
bengl May 28, 2021
add2360
fixup! review nits and AsyncHooks::MemoryInfo
bengl May 31, 2021
a968969
fixup! correct MemoryInfo
bengl May 31, 2021
5ea90f7
fixup! add checks for snapshot
bengl Jun 1, 2021
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
fixup! switch to weak globals
  • Loading branch information
@bengl
bengl committed May 27, 2021
commit bb559761d3690be97e01eba1c50575f812743bf1
3 changes: 2 additions & 1 deletion src/env-inl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ inline void AsyncHooks::SetJSPromiseHooks(v8::Local<v8::Function> init,
js_promise_hooks_[2].Reset(env()->isolate(), after);
js_promise_hooks_[3].Reset(env()->isolate(), resolve);
for (auto it = contexts_.begin(); it != contexts_.end(); it++) {
PersistentToLocal::Strong(*it)
PersistentToLocal::Weak(env()->isolate(), *it)
->SetPromiseHooks(init, before, after, resolve);
}
}
Expand Down Expand Up @@ -249,6 +249,7 @@ inline void AsyncHooks::AddContext(v8::Local<v8::Context> ctx) {
size_t id = contexts_.size();
contexts_.resize(id + 1);
contexts_[id].Reset(env()->isolate(), ctx);
contexts_[id].SetWeak();
Comment thread
addaleax marked this conversation as resolved.
}

inline void AsyncHooks::RemoveContext(v8::Local<v8::Context> ctx) {
Expand Down
3 changes: 2 additions & 1 deletion src/node_contextify.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,8 @@ ContextifyContext::ContextifyContext(
ContextifyContext::~ContextifyContext() {
env()->RemoveCleanupHook(CleanupHook, this);

env()->async_hooks()->RemoveContext(PersistentToLocal::Strong(context_));
env()->async_hooks()
->RemoveContext(PersistentToLocal::Weak(env()->isolate(), context_));
}


Expand Down