github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: broken --trace-sync-io flag in Node.js (#24649)

Browse Source
This commit is contained in:
Shelley Vohr
2020-07-20 14:11:11 -07:00
committed by GitHub
parent f3df14c7ae
commit ad94c7472e
3 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
script/node-disabled-tests.json
View File

@@ -6,7 +6,6 @@
"parallel/test-async-hooks-top-level-clearimmediate",
"parallel/test-inspector-async-hook-after-done",
"parallel/test-inspector-workers-flat-list",
"parallel/test-sync-io-option",
"parallel/test-heapdump-async-hooks-init-promise",
"parallel/test-http2-reset-flood",
"parallel/test-bootstrap-modules",

5
shell/app/node_main.cc
View File

@@ -130,6 +130,8 @@ int NodeMain(int argc, char* argv[]) {
node::LoadEnvironment(env);
env->set_trace_sync_io(env->options()->trace_sync_io);
bool more;
do {
more = uv_run(env->event_loop(), UV_RUN_ONCE);
@@ -146,6 +148,9 @@ int NodeMain(int argc, char* argv[]) {
} while (more == true);
node_debugger.Stop();
env->set_trace_sync_io(false);
exit_code = node::EmitExit(env);
env->set_can_call_into_js(false);
node::RunAtExit(env);

3
shell/browser/electron_browser_main_parts.cc
View File

@@ -336,6 +336,8 @@ void ElectronBrowserMainParts::PostEarlyInitialization() {
node_debugger_ = std::make_unique<NodeDebugger>(env);
node_debugger_->Start();
env->set_trace_sync_io(env->options()->trace_sync_io);
// Add Electron extended APIs.
electron_bindings_->BindTo(js_env_->isolate(), env->process_object());
@@ -550,6 +552,7 @@ void ElectronBrowserMainParts::PostMainMessageLoopRun() {
// Destroy node platform after all destructors_ are executed, as they may
// invoke Node/V8 APIs inside them.
node_debugger_->Stop();
node_env_->env()->set_trace_sync_io(false);
node_env_.reset();
js_env_->OnMessageLoopDestroying();