src: add Environment overload of EmitAsyncDestroy

addaleax · addaleax · commit 324154631097 · 2019-04-24T21:38:38.000+02:00
This can be necessary for being able to call the function when no JS Context is on the stack, e.g. during GC. Refs: #27218 PR-URL: #27255 Fixes: #27218 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
diff --git a/src/api/hooks.cc b/src/api/hooks.cc
@@ -130,8 +130,11 @@ async_context EmitAsyncInit(Isolate* isolate,
 }
 
 void EmitAsyncDestroy(Isolate* isolate, async_context asyncContext) {
-  AsyncWrap::EmitDestroy(
-      Environment::GetCurrent(isolate), asyncContext.async_id);
+  EmitAsyncDestroy(Environment::GetCurrent(isolate), asyncContext);
+}
+
+void EmitAsyncDestroy(Environment* env, async_context asyncContext) {
+  AsyncWrap::EmitDestroy(env, asyncContext.async_id);
 }
 
 }  // namespace node
diff --git a/src/node.h b/src/node.h
@@ -685,9 +685,16 @@ NODE_EXTERN async_context EmitAsyncInit(v8::Isolate* isolate,
                                         v8::Local<v8::String> name,
                                         async_id trigger_async_id = -1);
 
-/* Emit the destroy() callback. */
+/* Emit the destroy() callback. The overload taking an `Environment*` argument
+ * should be used when the Isolate’s current Context is not associated with
+ * a Node.js Environment, or when there is no current Context, for example
+ * when calling this function during garbage collection. In that case, the
+ * `Environment*` value should have been acquired previously, e.g. through
+ * `GetCurrentEnvironment()`. */
 NODE_EXTERN void EmitAsyncDestroy(v8::Isolate* isolate,
                                   async_context asyncContext);
+NODE_EXTERN void EmitAsyncDestroy(Environment* env,
+                                  async_context asyncContext);
 
 class InternalCallbackScope;
 

Original file line number	Diff line number	Diff line change
`@@ -130,8 +130,11 @@ async_context EmitAsyncInit(Isolate* isolate,`
`130`	`130`	`}`
`131`	`131`
`132`	`132`	`void EmitAsyncDestroy(Isolate* isolate, async_context asyncContext) {`
`133`		`- AsyncWrap::EmitDestroy(`
`134`		`- Environment::GetCurrent(isolate), asyncContext.async_id);`
	`133`	`+ EmitAsyncDestroy(Environment::GetCurrent(isolate), asyncContext);`
	`134`	`+}`
	`135`	`+`
	`136`	`+void EmitAsyncDestroy(Environment* env, async_context asyncContext) {`
	`137`	`+ AsyncWrap::EmitDestroy(env, asyncContext.async_id);`
`135`	`138`	`}`
`136`	`139`
`137`	`140`	`} // namespace node`