Commit f0e6acd
authored
node-api: make tsfn accept napi_finalize once more
The thread-safe function's finalizer is not called in conjunction with
the garbage collection of a JS value. In fact, it keeps a strong
reference to the JS function it is expected to call. Thus, it is safe
to make calls that affect GC state from its body.
PR-URL: #51801
Reviewed-By: Michael Dawson <midawson@redhat.com>
Reviewed-By: Chengzhong Wu <legendecas@gmail.com>1 parent 4e109e5 commit f0e6acd
3 files changed
Lines changed: 3 additions & 17 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1319,12 +1319,10 @@ napi_create_threadsafe_function(napi_env env, | |||
| 1319 | 1319 | size_t max_queue_size, | |
| 1320 | 1320 | size_t initial_thread_count, | |
| 1321 | 1321 | void* thread_finalize_data, | |
| 1322 | - node_api_nogc_finalize nogc_thread_finalize_cb, | ||
| 1322 | + napi_finalize thread_finalize_cb, | ||
| 1323 | 1323 | void* context, | |
| 1324 | 1324 | napi_threadsafe_function_call_js call_js_cb, | |
| 1325 | 1325 | napi_threadsafe_function* result) { | |
| 1326 | - napi_finalize thread_finalize_cb = | ||
| 1327 | - reinterpret_cast<napi_finalize>(nogc_thread_finalize_cb); | ||
| 1328 | 1326 | CHECK_ENV_NOT_IN_GC(env); | |
| 1329 | 1327 | CHECK_ARG(env, async_resource_name); | |
| 1330 | 1328 | RETURN_STATUS_IF_FALSE(env, initial_thread_count > 0, napi_invalid_arg); | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -209,7 +209,7 @@ napi_create_threadsafe_function(napi_env env, | |||
| 209 | 209 | size_t max_queue_size, | |
| 210 | 210 | size_t initial_thread_count, | |
| 211 | 211 | void* thread_finalize_data, | |
| 212 | - node_api_nogc_finalize thread_finalize_cb, | ||
| 212 | + napi_finalize thread_finalize_cb, | ||
| 213 | 213 | void* context, | |
| 214 | 214 | napi_threadsafe_function_call_js call_js_cb, | |
| 215 | 215 | napi_threadsafe_function* result); | |
Lines changed: 1 addition & 13 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -16,18 +16,6 @@ static void ThreadSafeFunctionFinalize(napi_env env, | |||
| 16 | 16 | NODE_API_CALL_RETURN_VOID(env, napi_delete_reference(env, js_func_ref)); | |
| 17 | 17 | } | |
| 18 | 18 | ||
| 19 | - static void ThreadSafeFunctionNogcFinalize(node_api_nogc_env env, | ||
| 20 | - void* data, | ||
| 21 | - void* hint) { | ||
| 22 | - #ifdef NAPI_EXPERIMENTAL | ||
| 23 | - NODE_API_NOGC_CALL_RETURN_VOID( | ||
| 24 | - env, | ||
| 25 | - node_api_post_finalizer(env, ThreadSafeFunctionFinalize, data, hint)); | ||
| 26 | - #else | ||
| 27 | - ThreadSafeFunctionFinalize(env, data, hint); | ||
| 28 | - #endif | ||
| 29 | - } | ||
| 30 | - | ||
| 31 | 19 | // Testing calling into JavaScript | |
| 32 | 20 | static napi_value CallIntoModule(napi_env env, napi_callback_info info) { | |
| 33 | 21 | size_t argc = 4; | |
@@ -46,7 +34,7 @@ static napi_value CallIntoModule(napi_env env, napi_callback_info info) { | |||
| 46 | 34 | 0, | |
| 47 | 35 | 1, | |
| 48 | 36 | finalize_func, | |
| 49 | - ThreadSafeFunctionNogcFinalize, | ||
| 37 | + ThreadSafeFunctionFinalize, | ||
| 50 | 38 | NULL, | |
| 51 | 39 | NULL, | |
| 52 | 40 | &tsfn)); | |
0 commit comments