rename to ExecutionAsyncResource

Author: mcollina

lib/async_hooks.js

@@ -24,7 +24,7 @@ const {
   getHookArrays,
   enableHooks,
   disableHooks,
-  currentResource,
+  executionAsyncResource,
   // Internal Embedder API
   newAsyncId,
   getDefaultTriggerAsyncId,
@@ -206,7 +206,7 @@ module.exports = {
   createHook,
   executionAsyncId,
   triggerAsyncId,
-  currentResource,
+  executionAsyncResource,
   // Embedder API
   AsyncResource,
 };

lib/internal/async_hooks.js

@@ -76,7 +76,7 @@ const active_hooks = {
 const { registerDestroyHook } = async_wrap;
 const { enqueueMicrotask } = internalBinding('task_queue');
 
-const { currentResource, setCurrentResource } = async_wrap;
+const { executionAsyncResource, setExecutionAsyncResource } = async_wrap;
 
 // Each constant tracks how many callbacks there are for any given step of
 // async execution. These are tracked so if the user didn't include callbacks
@@ -360,7 +360,7 @@ function emitBeforeScript(asyncId, triggerAsyncId, resource) {
   validateAsyncId(asyncId, 'asyncId');
   validateAsyncId(triggerAsyncId, 'triggerAsyncId');
 
-  setCurrentResource(resource);
+  setExecutionAsyncResource(resource);
   pushAsyncIds(asyncId, triggerAsyncId);
 
   if (async_hook_fields[kBefore] > 0)
@@ -374,7 +374,7 @@ function emitAfterScript(asyncId) {
   if (async_hook_fields[kAfter] > 0)
     emitAfterNative(asyncId);
 
-  setCurrentResource(null);
+  setExecutionAsyncResource(null);
 
   popAsyncIds(asyncId);
 }
@@ -463,7 +463,7 @@ module.exports = {
   clearDefaultTriggerAsyncId,
   clearAsyncIdStack,
   hasAsyncIdStack,
-  currentResource,
+  executionAsyncResource,
   // Internal Embedder API
   newAsyncId,
   getOrSetAsyncId,
@@ -477,7 +477,7 @@ module.exports = {
   emitAfter: emitAfterScript,
   emitDestroy: emitDestroyScript,
   registerDestroyHook,
-  setCurrentResource,
+  setExecutionAsyncResource,
   nativeHooks: {
     init: emitInitNative,
     before: emitBeforeNative,

lib/internal/timers.js

@@ -97,7 +97,7 @@ const {
   emitBefore,
   emitAfter,
   emitDestroy,
-  setCurrentResource
+  setExecutionAsyncResource
 } = require('internal/async_hooks');
 
 // Symbols for storing async id state.
@@ -539,7 +539,7 @@ function getTimerCallbacks(runNextTicks) {
         else
           timer._onTimeout(...args);
       } finally {
-        setCurrentResource(null);
+        setExecutionAsyncResource(null);
         if (timer._repeat && timer._idleTimeout !== -1) {
           timer._idleTimeout = timer._repeat;
           if (start === undefined)

src/async_wrap.cc

@@ -30,7 +30,7 @@
 
 // TODO(mcollina): should this be moved in a more public space?
 // embedders will not be able to use this field
-#define CURRENT_RESOURCE_FIELD 10
+#define EXECUTION_RESOURCE_FIELD 10
 
 using v8::Context;
 using v8::DontDelete;
@@ -152,7 +152,7 @@ void AsyncWrap::EmitTraceEventBefore() {
 void AsyncWrap::EmitBefore(Environment* env, double async_id,
     v8::Local<v8::Object> resource) {
   v8::Local<v8::Context> context = env->isolate()->GetCurrentContext();
-  context->SetEmbedderData(CURRENT_RESOURCE_FIELD, resource);
+  context->SetEmbedderData(EXECUTION_RESOURCE_FIELD, resource);
 
   Emit(env, async_id, AsyncHooks::kBefore,
        env->async_hooks_before_function());
@@ -184,7 +184,7 @@ void AsyncWrap::EmitAfter(Environment* env, double async_id) {
   Emit(env, async_id, AsyncHooks::kAfter,
        env->async_hooks_after_function());
 
-  context->SetEmbedderData(CURRENT_RESOURCE_FIELD, v8::Null(isolate));
+  context->SetEmbedderData(EXECUTION_RESOURCE_FIELD, v8::Null(isolate));
 }
 
 class PromiseWrap : public AsyncWrap {
@@ -270,7 +270,7 @@ static void PromiseHook(PromiseHookType type, Local<Promise> promise,
 
       // needed for async functions :/
       // the top level will not emit before and after
-      env->context()->SetEmbedderData(CURRENT_RESOURCE_FIELD, wrap->object());
+      env->context()->SetEmbedderData(EXECUTION_RESOURCE_FIELD, wrap->object());
     }
   }
 
@@ -399,16 +399,16 @@ static void RegisterDestroyHook(const FunctionCallbackInfo<Value>& args) {
   p->target.SetWeak(p, AsyncWrap::WeakCallback, WeakCallbackType::kParameter);
 }
 
-static void CurrentResource(const FunctionCallbackInfo<Value>& args) {
+static void GetExecutionAsyncResource(const FunctionCallbackInfo<Value>& args) {
   Isolate* isolate = args.GetIsolate();
   v8::Local<v8::Context> context = isolate->GetCurrentContext();
-  args.GetReturnValue().Set(context->GetEmbedderData(CURRENT_RESOURCE_FIELD));
+  args.GetReturnValue().Set(context->GetEmbedderData(EXECUTION_RESOURCE_FIELD));
 }
 
-static void SetCurrentResource(const FunctionCallbackInfo<Value>& args) {
+static void SetExecutionAsyncResource(const FunctionCallbackInfo<Value>& args) {
   Isolate* isolate = args.GetIsolate();
   v8::Local<v8::Context> context = isolate->GetCurrentContext();
-  context->SetEmbedderData(CURRENT_RESOURCE_FIELD, args[0]);
+  context->SetEmbedderData(EXECUTION_RESOURCE_FIELD, args[0]);
 }
 
 void AsyncWrap::GetAsyncId(const FunctionCallbackInfo<Value>& args) {
@@ -498,10 +498,11 @@ void AsyncWrap::Initialize(Local<Object> target,
   env->SetMethod(target, "enablePromiseHook", EnablePromiseHook);
   env->SetMethod(target, "disablePromiseHook", DisablePromiseHook);
   env->SetMethod(target, "registerDestroyHook", RegisterDestroyHook);
-  env->SetMethod(target, "currentResource", CurrentResource);
-  env->SetMethod(target, "setCurrentResource", SetCurrentResource);
+  env->SetMethod(target, "executionAsyncResource", GetExecutionAsyncResource);
+  env->SetMethod(target, "setExecutionAsyncResource",
+                 SetExecutionAsyncResource);
 
-  context->SetEmbedderData(CURRENT_RESOURCE_FIELD, v8::Null(isolate));
+  context->SetEmbedderData(EXECUTION_RESOURCE_FIELD, v8::Null(isolate));
 
   PropertyAttribute ReadOnlyDontDelete =
       static_cast<PropertyAttribute>(ReadOnly | DontDelete);

test/parallel/test-async-hooks-current-resource-await.js

@@ -3,7 +3,7 @@
 const common = require('../common');
 const sleep = require('util').promisify(setTimeout);
 const assert = require('assert');
-const { currentResource, createHook } = require('async_hooks');
+const { executionAsyncResource, createHook } = require('async_hooks');
 const { createServer, get } = require('http');
 const sym = Symbol('cls');
 const id = Symbol('id');
@@ -13,7 +13,7 @@ const id = Symbol('id');
 
 createHook({
   init(asyncId, type, triggerAsyncId, resource) {
-    const cr = currentResource();
+    const cr = executionAsyncResource();
     resource[id] = asyncId;
     if (cr) {
       resource[sym] = cr[sym];
@@ -22,9 +22,9 @@ createHook({
 }).enable();
 
 async function handler(req, res) {
-  currentResource()[sym] = { state: req.url };
+  executionAsyncResource()[sym] = { state: req.url };
   await sleep(10);
-  const { state } = currentResource()[sym];
+  const { state } = executionAsyncResource()[sym];
   res.setHeader('content-type', 'application/json');
   res.end(JSON.stringify({ state }));
 }

test/parallel/test-async-hooks-current-resource.js

@@ -2,7 +2,7 @@
 
 const common = require('../common');
 const assert = require('assert');
-const { currentResource, createHook } = require('async_hooks');
+const { executionAsyncResource, createHook } = require('async_hooks');
 const { createServer, get } = require('http');
 const sym = Symbol('cls');
 const id = Symbol('id');
@@ -11,7 +11,7 @@ const id = Symbol('id');
 
 createHook({
   init(asyncId, type, triggerAsyncId, resource) {
-    const cr = currentResource();
+    const cr = executionAsyncResource();
     resource[id] = asyncId;
     if (cr) {
       resource[sym] = cr[sym];
@@ -20,9 +20,9 @@ createHook({
 }).enable();
 
 const server = createServer(function(req, res) {
-  currentResource()[sym] = { state: req.url };
+  executionAsyncResource()[sym] = { state: req.url };
   setTimeout(function() {
-    const { state } = currentResource()[sym];
+    const { state } = executionAsyncResource()[sym];
     res.setHeader('content-type', 'application/json');
     res.end(JSON.stringify({ state }));
   }, 10);