1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

src: do not call into JS in the maxAsyncCallStackDepthChanged interrupt

Browse Source 
If Debugger.setAsyncCallStackDepth is sent during bootstrap,
we cannot immediately call into JS to enable the hooks, which could
interrupt the JS execution of bootstrap. So instead we save the
notification in the inspector agent if it's sent in the middle of
bootstrap, and process the notification later here.

Refs: https://github.com/nodejs/node/issues/26798

PR-URL: https://github.com/nodejs/node/pull/26935
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Eugene Ostroukhov <eostroukhov@google.com>
Reviewed-By: Minwoo Jung <minwoo@nodesource.com>
This commit is contained in:
Joyee Cheung 2019-03-26 16:03:27 -04:00
parent 58bf61524d
commit 7aad63ba34
No known key found for this signature in database
GPG Key ID: 92B78A53C8303B8D
4 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/internal/bootstrap/node.js
View File

@ -157,17 +157,6 @@ if (isMainThread) {
const { nativeHooks } = require('internal/async_hooks');
internalBinding('async_wrap').setupHooks(nativeHooks);
// XXX(joyeecheung): this has to be done after the initial load of
// `internal/async_hooks` otherwise `async_hooks` cannot require
// `internal/async_hooks`. Investigate why.
if (config.hasInspector) {
const {
enable,
disable
} = require('internal/inspector_async_hook');
internalBinding('inspector').registerAsyncHook(enable, disable);
}
const {
setupTaskQueue,
queueMicrotask

18
lib/internal/bootstrap/pre_execution.js
View File

@ -7,7 +7,7 @@ function prepareMainThreadExecution() {
// Patch the process object with legacy properties and normalizations
patchProcessObject();
setupTraceCategoryState();
setupInspectorHooks();
setupWarningHandler();
// Resolve the coverage directory to an absolute path, and
@ -168,6 +168,21 @@ function setupTraceCategoryState() {
toggleTraceCategoryState(isTraceCategoryEnabled('node.async_hooks'));
}
function setupInspectorHooks() {
// If Debugger.setAsyncCallStackDepth is sent during bootstrap,
// we cannot immediately call into JS to enable the hooks, which could
// interrupt the JS execution of bootstrap. So instead we save the
// notification in the inspector agent if it's sent in the middle of
// bootstrap, and process the notification later here.
if (internalBinding('config').hasInspector) {
const {
enable,
disable
} = require('internal/inspector_async_hook');
internalBinding('inspector').registerAsyncHook(enable, disable);
}
}
// In general deprecations are intialized wherever the APIs are implemented,
// this is used to deprecate APIs implemented in C++ where the deprecation
// utitlities are not easily accessible.
@ -361,5 +376,6 @@ module.exports = {
initializeFrozenIntrinsics,
loadPreloadModules,
setupTraceCategoryState,
setupInspectorHooks,
initializeReport
};

2
lib/internal/main/worker_thread.js
View File

@ -6,6 +6,7 @@
const {
patchProcessObject,
setupCoverageHooks,
setupInspectorHooks,
setupWarningHandler,
setupDebugEnv,
initializeDeprecations,
@ -43,6 +44,7 @@ const {
const publicWorker = require('worker_threads');
patchProcessObject();
setupInspectorHooks();
setupDebugEnv();
const debug = require('internal/util/debuglog').debuglog('worker');

1
src/inspector_agent.cc
View File

@ -835,6 +835,7 @@ void Agent::DisableAsyncHook() {
void Agent::ToggleAsyncHook(Isolate* isolate,
const node::Persistent<Function>& fn) {
CHECK(parent_env_->has_run_bootstrapping_code());
HandleScope handle_scope(isolate);
CHECK(!fn.IsEmpty());
auto context = parent_env_->context();