mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
43b9988c57
* chore: cherry-pick 1fe571a from node Backports https://github.com/nodejs/node/pull/37000 * Fix merge error * update patches Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: Cheng Zhao <zcbenz@gmail.com> Co-authored-by: Electron Bot <electron@github.com>
74 lines
3.0 KiB
Diff
74 lines
3.0 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Tyler Ang-Wanek <tylerw@axosoft.com>
|
|
Date: Tue, 19 Jan 2021 07:39:14 -0700
|
|
Subject: src: inline AsyncCleanupHookHandle in headers
|
|
|
|
Fixes: https://github.com/nodejs/node/issues/36349
|
|
|
|
PR-URL: https://github.com/nodejs/node/pull/37000
|
|
Reviewed-By: Anna Henningsen <anna@addaleax.net>
|
|
Reviewed-By: Rich Trott <rtrott@gmail.com>
|
|
Reviewed-By: James M Snell <jasnell@gmail.com>
|
|
|
|
diff --git a/src/api/hooks.cc b/src/api/hooks.cc
|
|
index 3b16c0350d8a8494202144407664af41d338fe04..8b6f209cc8f167173a957049dec96dbec7ccc8d1 100644
|
|
--- a/src/api/hooks.cc
|
|
+++ b/src/api/hooks.cc
|
|
@@ -131,7 +131,7 @@ static void RunAsyncCleanupHook(void* arg) {
|
|
info->fun(info->arg, FinishAsyncCleanupHook, info);
|
|
}
|
|
|
|
-AsyncCleanupHookHandle AddEnvironmentCleanupHook(
|
|
+ACHHandle* AddEnvironmentCleanupHookInternal(
|
|
Isolate* isolate,
|
|
AsyncCleanupHook fun,
|
|
void* arg) {
|
|
@@ -143,11 +143,11 @@ AsyncCleanupHookHandle AddEnvironmentCleanupHook(
|
|
info->arg = arg;
|
|
info->self = info;
|
|
env->AddCleanupHook(RunAsyncCleanupHook, info.get());
|
|
- return AsyncCleanupHookHandle(new ACHHandle { info });
|
|
+ return new ACHHandle { info };
|
|
}
|
|
|
|
-void RemoveEnvironmentCleanupHook(
|
|
- AsyncCleanupHookHandle handle) {
|
|
+void RemoveEnvironmentCleanupHookInternal(
|
|
+ ACHHandle* handle) {
|
|
if (handle->info->started) return;
|
|
handle->info->self.reset();
|
|
handle->info->env->RemoveCleanupHook(RunAsyncCleanupHook, handle->info.get());
|
|
diff --git a/src/node.h b/src/node.h
|
|
index 0917daec298229a942c1790becfbefd19d01fb8d..8e52f9e8065750b48ddb36f447e4af54f993acfa 100644
|
|
--- a/src/node.h
|
|
+++ b/src/node.h
|
|
@@ -747,12 +747,26 @@ struct ACHHandle;
|
|
struct NODE_EXTERN DeleteACHHandle { void operator()(ACHHandle*) const; };
|
|
typedef std::unique_ptr<ACHHandle, DeleteACHHandle> AsyncCleanupHookHandle;
|
|
|
|
-NODE_EXTERN AsyncCleanupHookHandle AddEnvironmentCleanupHook(
|
|
+/* This function is not intended to be used externally, it exists to aid in
|
|
+ * keeping ABI compatibility between Node and Electron. */
|
|
+NODE_EXTERN ACHHandle* AddEnvironmentCleanupHookInternal(
|
|
v8::Isolate* isolate,
|
|
void (*fun)(void* arg, void (*cb)(void*), void* cbarg),
|
|
void* arg);
|
|
+inline AsyncCleanupHookHandle AddEnvironmentCleanupHook(
|
|
+ v8::Isolate* isolate,
|
|
+ void (*fun)(void* arg, void (*cb)(void*), void* cbarg),
|
|
+ void* arg) {
|
|
+ return AsyncCleanupHookHandle(AddEnvironmentCleanupHookInternal(isolate, fun,
|
|
+ arg));
|
|
+}
|
|
|
|
-NODE_EXTERN void RemoveEnvironmentCleanupHook(AsyncCleanupHookHandle holder);
|
|
+/* This function is not intended to be used externally, it exists to aid in
|
|
+ * keeping ABI compatibility between Node and Electron. */
|
|
+NODE_EXTERN void RemoveEnvironmentCleanupHookInternal(ACHHandle* holder);
|
|
+inline void RemoveEnvironmentCleanupHook(AsyncCleanupHookHandle holder) {
|
|
+ RemoveEnvironmentCleanupHookInternal(holder.get());
|
|
+}
|
|
|
|
/* Returns the id of the current execution context. If the return value is
|
|
* zero then no execution has been set. This will happen if the user handles
|