src: move no_async_hooks_checks to env

danbev · danbev · commit 1747d707d77f · 2018-09-17T07:45:52.000+02:00
This commit moves the setting of AsyncHooks no_force_checks to the Environment constructor instead of from the Start function in node.cc. PR-URL: #22784 Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: James M Snell <jasnell@gmail.com>
diff --git a/src/env.cc b/src/env.cc
@@ -189,6 +189,9 @@ Environment::Environment(IsolateData* isolate_data,
 
   isolate()->GetHeapProfiler()->AddBuildEmbedderGraphCallback(
       BuildEmbedderGraph, this);
+  if (options_->no_force_async_hooks_checks) {
+    async_hooks_.no_force_checks();
+  }
 }
 
 Environment::~Environment() {
diff --git a/src/node.cc b/src/node.cc
@@ -2894,12 +2894,6 @@ inline int Start(Isolate* isolate, IsolateData* isolate_data,
     return 12;  // Signal internal error.
   }
 
-  // TODO(addaleax): Maybe access this option directly instead of setting
-  // a boolean member of Environment. Ditto below for trace_sync_io.
-  if (env.options()->no_force_async_hooks_checks) {
-    env.async_hooks()->no_force_checks();
-  }
-
   {
     Environment::AsyncCallbackScope callback_scope(&env);
     env.async_hooks()->push_async_ids(1, 0);

Original file line number	Diff line number	Diff line change
`@@ -189,6 +189,9 @@ Environment::Environment(IsolateData* isolate_data,`
`189`	`189`
`190`	`190`	`isolate()->GetHeapProfiler()->AddBuildEmbedderGraphCallback(`
`191`	`191`	`BuildEmbedderGraph, this);`
	`192`	`+ if (options_->no_force_async_hooks_checks) {`
	`193`	`+ async_hooks_.no_force_checks();`
	`194`	`+ }`
`192`	`195`	`}`
`193`	`196`
`194`	`197`	`Environment::~Environment() {`
Original file line number	Diff line number	Diff line change
`@@ -2894,12 +2894,6 @@ inline int Start(Isolate* isolate, IsolateData* isolate_data,`
`2894`	`2894`	`return 12; // Signal internal error.`
`2895`	`2895`	`}`
`2896`	`2896`
`2897`		`- // TODO(addaleax): Maybe access this option directly instead of setting`
`2898`		`- // a boolean member of Environment. Ditto below for trace_sync_io.`
`2899`		`- if (env.options()->no_force_async_hooks_checks) {`
`2900`		`- env.async_hooks()->no_force_checks();`
`2901`		`- }`
`2902`		`-`
`2903`	`2897`	`{`
`2904`	`2898`	`Environment::AsyncCallbackScope callback_scope(&env);`
`2905`	`2899`	`env.async_hooks()->push_async_ids(1, 0);`