-
Notifications
You must be signed in to change notification settings - Fork 29.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
n-api: do not call into JS when that is not allowed
Check whether calling into JS is allowed before doing so. PR-URL: #26127 Reviewed-By: Gus Caplan <me@gus.host> Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
- Loading branch information
Showing
5 changed files
with
84 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
{ | ||
"targets": [ | ||
{ | ||
"target_name": "test_worker_terminate", | ||
"sources": [ "test_worker_terminate.c" ] | ||
} | ||
] | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
'use strict'; | ||
const common = require('../../common'); | ||
const assert = require('assert'); | ||
const { Worker, isMainThread, workerData } = require('worker_threads'); | ||
|
||
if (isMainThread) { | ||
const counter = new Int32Array(new SharedArrayBuffer(4)); | ||
const worker = new Worker(__filename, { workerData: { counter } }); | ||
worker.on('exit', common.mustCall(() => { | ||
assert.strictEqual(counter[0], 1); | ||
})); | ||
worker.on('error', common.mustNotCall()); | ||
} else { | ||
const { Test } = require(`./build/${common.buildType}/test_worker_terminate`); | ||
|
||
const { counter } = workerData; | ||
// Test() tries to call a function twice and asserts that the second call does | ||
// not work because of a pending exception. | ||
Test(() => { | ||
Atomics.add(counter, 0, 1); | ||
process.exit(); | ||
}); | ||
} |
39 changes: 39 additions & 0 deletions
39
test/node-api/test_worker_terminate/test_worker_terminate.c
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
#include <stdio.h> | ||
#include <node_api.h> | ||
#include <assert.h> | ||
#include "../../js-native-api/common.h" | ||
|
||
napi_value Test(napi_env env, napi_callback_info info) { | ||
size_t argc = 1; | ||
napi_value recv; | ||
napi_value argv[1]; | ||
napi_status status; | ||
|
||
NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &recv, NULL)); | ||
NAPI_ASSERT(env, argc >= 1, "Not enough arguments, expected 1."); | ||
|
||
napi_valuetype t; | ||
NAPI_CALL(env, napi_typeof(env, argv[0], &t)); | ||
NAPI_ASSERT(env, t == napi_function, | ||
"Wrong first argument, function expected."); | ||
|
||
status = napi_call_function(env, recv, argv[0], 0, NULL, NULL); | ||
assert(status == napi_ok); | ||
status = napi_call_function(env, recv, argv[0], 0, NULL, NULL); | ||
assert(status == napi_pending_exception); | ||
|
||
return NULL; | ||
} | ||
|
||
napi_value Init(napi_env env, napi_value exports) { | ||
napi_property_descriptor properties[] = { | ||
DECLARE_NAPI_PROPERTY("Test", Test) | ||
}; | ||
|
||
NAPI_CALL(env, napi_define_properties( | ||
env, exports, sizeof(properties) / sizeof(*properties), properties)); | ||
|
||
return exports; | ||
} | ||
|
||
NAPI_MODULE(NODE_GYP_MODULE_NAME, Init) |