src: move AsyncCallbackScope out of Environment

PR-URL: https://github.com/nodejs/node/pull/26824
Refs: https://github.com/nodejs/node/issues/26776
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: James M Snell <jasnell@gmail.com>

1 files changed, 13 insertions, 7 deletions

diff --git a/src/env-inl.h b/src/env-inl.h
index 8d2327034a..ce4adca6c8 100644
--- a/src/env-inl.h
+++ b/src/env-inl.h
@@ -212,18 +212,24 @@ Environment* Environment::ForAsyncHooks(AsyncHooks* hooks) {
   return ContainerOf(&Environment::async_hooks_, hooks);
 }
 
+inline AsyncCallbackScope::AsyncCallbackScope(Environment* env) : env_(env) {
+  env_->PushAsyncCallbackScope();
+}
 
-inline Environment::AsyncCallbackScope::AsyncCallbackScope(Environment* env)
-    : env_(env) {
-  env_->makecallback_cntr_++;
+inline AsyncCallbackScope::~AsyncCallbackScope() {
+  env_->PopAsyncCallbackScope();
+}
+
+inline size_t Environment::async_callback_scope_depth() const {
+  return async_callback_scope_depth_;
 }
 
-inline Environment::AsyncCallbackScope::~AsyncCallbackScope() {
-  env_->makecallback_cntr_--;
+inline void Environment::PushAsyncCallbackScope() {
+  async_callback_scope_depth_++;
 }
 
-inline size_t Environment::makecallback_depth() const {
-  return makecallback_cntr_;
+inline void Environment::PopAsyncCallbackScope() {
+  async_callback_scope_depth_--;
 }
 
 inline Environment::ImmediateInfo::ImmediateInfo(v8::Isolate* isolate)