mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: allow Node.js to manage microtasks queue (#28957)

Browse source 
* fix: allow Node.js to manage microtasks queue

When `uv_run()` resulted in invocation of JS functions the microtask
queue checkpoint in Node's CallbackScope was a no-op because the
expected microtask queue policy was `kExplicit` and Electron ran under
`kScoped` policy. This change switches policy to `kExplicit` right
before `uv_run()` and reverts it back to original value after `uv_run()`
completes to provide better compatibility with Node.

* add comment
This commit is contained in:
Fedor Indutny 2021-05-03 14:30:12 -07:00 committed by GitHub
parent dd80952877
commit 99909baeac
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
shell/common/node_bindings.cc
View file

@ -575,8 +575,13 @@ void NodeBindings::UvRunOnce() {
// Enter node context while dealing with uv events. // Enter node context while dealing with uv events.
v8::Context::Scope context_scope(env->context()); v8::Context::Scope context_scope(env->context());
// Perform microtask checkpoint after running JavaScript. // Node.js expects `kExplicit` microtasks policy and will run microtasks
gin_helper::MicrotasksScope microtasks_scope(env->isolate()); // checkpoints after every call into JavaScript. Since we use a different
// policy in the renderer - switch to `kExplicit` and then drop back to the
// previous policy value.
auto old_policy = env->isolate()->GetMicrotasksPolicy();
DCHECK_EQ(v8::MicrotasksScope::GetCurrentDepth(env->isolate()), 0);
env->isolate()->SetMicrotasksPolicy(v8::MicrotasksPolicy::kExplicit);
if (browser_env_ != BrowserEnvironment::kBrowser) if (browser_env_ != BrowserEnvironment::kBrowser)
TRACE_EVENT_BEGIN0("devtools.timeline", "FunctionCall"); TRACE_EVENT_BEGIN0("devtools.timeline", "FunctionCall");
@ -587,6 +592,8 @@ void NodeBindings::UvRunOnce() {
if (browser_env_ != BrowserEnvironment::kBrowser) if (browser_env_ != BrowserEnvironment::kBrowser)
TRACE_EVENT_END0("devtools.timeline", "FunctionCall"); TRACE_EVENT_END0("devtools.timeline", "FunctionCall");
env->isolate()->SetMicrotasksPolicy(old_policy);
if (r == 0) if (r == 0)
base::RunLoop().QuitWhenIdle(); // Quit from uv. base::RunLoop().QuitWhenIdle(); // Quit from uv.