Skip to content

src: add callback scope for native immediates #34366

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
addaleax wants to merge 2 commits into from
Closed

src: add callback scope for native immediates #34366

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6410b65
src: add callback scope for native immediates
addaleax Jul 14, 2020
1309b61
fixup! src: add callback scope for native immediates
addaleax Jul 14, 2020
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
Next Next commit
src: add callback scope for native immediates 
This ensures that microtasks scheduled by native immediates are run
after the tasks are done. In particular, this affects the inspector
integration since 6f9f546.

Fixes: #33002
Refs: #32523
  • Loading branch information
@addaleax
addaleax committed Jul 14, 2020
commit 6410b65a73caf10c43de0437622cb4ede5569cc9
3 changes: 3 additions & 0 deletions src/env.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -657,6 +657,9 @@ void Environment::RunAndClearInterrupts() {
void Environment::RunAndClearNativeImmediates(bool only_refed) {
TraceEventScope trace_scope(TRACING_CATEGORY_NODE1(environment),
"RunAndClearNativeImmediates", this);
HandleScope handle_scope(isolate_);
InternalCallbackScope cb_scope(this, Object::New(isolate_), { 0, 0 });

size_t ref_count = 0;

// Handle interrupts first. These functions are not allowed to throw
Expand Down
26 changes: 26 additions & 0 deletions test/cctest/test_environment.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -533,3 +533,29 @@ TEST_F(EnvironmentTest, ExitHandlerTest) {
node::LoadEnvironment(*env, "process.exit(42)").ToLocalChecked();
EXPECT_EQ(callback_calls, 1);
}

TEST_F(EnvironmentTest, SetImmediateMicrotasks) {
int called = 0;

{
const v8::HandleScope handle_scope(isolate_);
const Argv argv;
Env env {handle_scope, argv};

node::LoadEnvironment(*env,
[&](const node::StartExecutionCallbackInfo& info)
-> v8::MaybeLocal<v8::Value> {
return v8::Object::New(isolate_);
});

(*env)->SetImmediate([&](node::Environment* env_arg) {
EXPECT_EQ(env_arg, *env);
isolate_->EnqueueMicrotask([](void* arg) {
++*static_cast<int*>(arg);
}, &called);
}, node::CallbackFlags::kRefed);
uv_run(&current_loop, UV_RUN_DEFAULT);
}

EXPECT_EQ(called, 1);
}