Commit 66de634

Browse files
bnoordhuisjuanarbol
bnoordhuis
authored and
juanarbol
committed
node-api: add napi_create_external_sharedarraybuffer
Creates a SharedArrayBuffer from externally managed memory. Fixes: #62259 PR-URL: #62623 Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Chengzhong Wu <legendecas@gmail.com> Reviewed-By: Vladimir Morozov <vmorozov@microsoft.com> Reviewed-By: Robert Nagy <ronagy@icloud.com> Signed-off-by: Juan José Arboleda <soyjuanarbol@gmail.com>
1 parent e306521 commit 66de634

7 files changed

Lines changed: 132 additions & 2 deletions

File tree

‎doc/api/n-api.md‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2565,6 +2565,41 @@ object just created has been garbage collected.
25652565
JavaScript `ArrayBuffer`s are described in
25662566
[Section ArrayBuffer objects][] of the ECMAScript Language Specification.
25672567

2568+
#### `node_api_create_external_sharedarraybuffer`
2569+
2570+
<!-- YAML
2571+
added: REPLACEME
2572+
-->
2573+
2574+
```c
2575+
napi_status
2576+
node_api_create_external_sharedarraybuffer(napi_env env,
2577+
void* external_data,
2578+
size_t byte_length,
2579+
node_api_noenv_finalize finalize_cb,
2580+
void* finalize_hint,
2581+
napi_value* result)
2582+
```
2583+
2584+
* `[in] env`: The environment that the API is invoked under.
2585+
* `[in] external_data`: Pointer to the underlying byte buffer of the
2586+
`SharedArrayBuffer`.
2587+
* `[in] byte_length`: The length in bytes of the underlying buffer.
2588+
* `[in] finalize_cb`: Optional callback to call when the `SharedArrayBuffer` is
2589+
being collected. Called on an arbitrary thread. Because a `SharedArrayBuffer`
2590+
can outlive the environment it's created in, the callback does not receive a
2591+
reference to `env`.
2592+
* `[in] finalize_hint`: Optional hint to pass to the finalize callback during
2593+
collection.
2594+
* `[out] result`: A `napi_value` representing a JavaScript `SharedArrayBuffer`.
2595+
2596+
Returns `napi_ok` if the API succeeded.
2597+
2598+
Create a `SharedArrayBuffer` with externally managed memory.
2599+
2600+
See the entry on [`napi_create_external_arraybuffer`][] for runtime
2601+
compatibility.
2602+
25682603
#### `napi_create_external_buffer`
25692604

25702605
<!-- YAML

‎src/js_native_api.h‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -420,6 +420,16 @@ napi_create_external_arraybuffer(napi_env env,
420420
node_api_basic_finalizefinalize_cb,
421421
void*finalize_hint,
422422
napi_value*result);
423+
#ifdefNAPI_EXPERIMENTAL
424+
#defineNODE_API_EXPERIMENTAL_HAS_CREATE_EXTERNAL_SHAREDARRAYBUFFER
425+
NAPI_EXTERNnapi_statusNAPI_CDECL
426+
node_api_create_external_sharedarraybuffer(napi_envenv,
427+
void*external_data,
428+
size_tbyte_length,
429+
node_api_noenv_finalizefinalize_cb,
430+
void*finalize_hint,
431+
napi_value*result);
432+
#endif// NAPI_EXPERIMENTAL
423433
#endif// NODE_API_NO_EXTERNAL_BUFFERS_ALLOWED
424434
NAPI_EXTERNnapi_statusNAPI_CDECLnapi_get_arraybuffer_info(
425435
napi_envenv, napi_valuearraybuffer, void**data, size_t*byte_length);

‎src/js_native_api_types.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,10 @@ typedef void(NAPI_CDECL* node_api_nogc_finalize)(node_api_nogc_env env,
174174
#endif
175175
typedefnode_api_nogc_finalizenode_api_basic_finalize;
176176

177+
// A finalizer that can be called from any thread and at any time.
178+
typedefvoid(NAPI_CDECL*node_api_noenv_finalize)(void*finalize_data,
179+
void*finalize_hint);
180+
177181
typedefstruct {
178182
// One of utf8name or name should be NULL.
179183
constchar*utf8name;

‎src/js_native_api_v8.cc‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3068,6 +3068,48 @@ napi_create_external_arraybuffer(napi_env env,
30683068
env, buffer, nullptr, nullptr, nullptr, result, nullptr);
30693069
}
30703070

3071+
napi_status NAPI_CDECL
3072+
node_api_create_external_sharedarraybuffer(napi_env env,
3073+
void* external_data,
3074+
size_t byte_length,
3075+
node_api_noenv_finalize finalize_cb,
3076+
void* finalize_hint,
3077+
napi_value* result) {
3078+
NAPI_PREAMBLE(env);
3079+
CHECK_ARG(env, result);
3080+
#ifdef V8_ENABLE_SANDBOX
3081+
returnnapi_set_last_error(env, napi_no_external_buffers_allowed);
3082+
#else
3083+
structFinalizerData {
3084+
void (*cb)(void* external_data, void* finalize_hint);
3085+
void* hint;
3086+
};
3087+
auto deleter = [](void* external_data, size_t length, void* deleter_data) {
3088+
if (auto fd = static_cast<FinalizerData*>(deleter_data)) {
3089+
fd->cb(external_data, fd->hint);
3090+
delete fd;
3091+
}
3092+
};
3093+
FinalizerData* deleter_data = nullptr;
3094+
if (finalize_cb != nullptr) {
3095+
deleter_data = new FinalizerData{finalize_cb, finalize_hint};
3096+
}
3097+
auto unique_backing_store = v8::SharedArrayBuffer::NewBackingStore(
3098+
external_data,
3099+
byte_length,
3100+
deleter,
3101+
reinterpret_cast<void*>(deleter_data));
3102+
CHECK(!!unique_backing_store); // Cannot fail.
3103+
auto shared_backing_store =
3104+
std::shared_ptr<v8::BackingStore>(std::move(unique_backing_store));
3105+
auto shared_array_buffer =
3106+
v8::SharedArrayBuffer::New(env->isolate, std::move(shared_backing_store));
3107+
CHECK_MAYBE_EMPTY(env, shared_array_buffer, napi_generic_failure);
3108+
*result = v8impl::JsValueFromV8LocalValue(shared_array_buffer);
3109+
returnnapi_clear_last_error(env);
3110+
#endif// V8_ENABLE_SANDBOX
3111+
}
3112+
30713113
napi_status NAPI_CDECLnapi_get_arraybuffer_info(napi_env env,
30723114
napi_value arraybuffer,
30733115
void** data,

‎test/node-api/test_buffer/binding.gyp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
{
44
"target_name": "test_buffer",
55
"defines": [
6-
'NAPI_VERSION=10'
6+
"NAPI_EXPERIMENTAL",
7+
"NODE_API_EXPERIMENTAL_NO_WARNING"
78
],
89
"sources": [ "test_buffer.c" ]
910
},

‎test/node-api/test_buffer/test.js‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
constcommon=require('../../common');
55
constbinding=require(`./build/${common.buildType}/test_buffer`);
66
constassert=require('assert');
7-
consttick=require('util').promisify(require('../../common/tick'));
7+
constutil=require('util');
8+
consttick=util.promisify(require('../../common/tick'));
89

910
(asyncfunction(){
1011
assert.strictEqual(binding.newBuffer().toString(),binding.theText);
@@ -26,6 +27,17 @@ const tick = require('util').promisify(require('../../common/tick'));
2627
console.log('gc2');
2728
assert.strictEqual(binding.getDeleterCallCount(),2);
2829

30+
// Caveat emptor: it's indeterminate when the SharedArrayBuffer's backing
31+
// store is reclaimed; at least some of the time it happens even before
32+
// calling gc().
33+
letsab=binding.newExternalSharedArrayBuffer();
34+
assert(util.types.isSharedArrayBuffer(sab));
35+
sab=null;
36+
global.gc();
37+
awaittick(10);
38+
console.log('gc3');
39+
assert.strictEqual(binding.getDeleterCallCount(),3);
40+
2941
// To test this doesn't crash
3042
binding.invalidObjectAsBuffer({});
3143

‎test/node-api/test_buffer/test_buffer.c‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,30 @@ static napi_value newExternalBuffer(napi_env env, napi_callback_info info) {
5858
returntheBuffer;
5959
}
6060

61+
staticcharexternalSharedArrayBufferData[1];
62+
63+
staticvoidfreeExternalSharedArrayBuffer(void*data, void*hint) {
64+
(void)hint;
65+
NODE_API_BASIC_ASSERT_RETURN_VOID(
66+
data== (void*)externalSharedArrayBufferData,
67+
"SharedArrayBuffer points to wrong data");
68+
deleterCallCount++;
69+
}
70+
71+
staticnapi_valuenewExternalSharedArrayBuffer(napi_envenv,
72+
napi_callback_infoinfo) {
73+
napi_valuesab;
74+
NODE_API_CALL(
75+
env,
76+
node_api_create_external_sharedarraybuffer(env,
77+
externalSharedArrayBufferData,
78+
1,
79+
freeExternalSharedArrayBuffer,
80+
NULL,
81+
&sab));
82+
returnsab;
83+
}
84+
6185
staticnapi_valuegetDeleterCallCount(napi_envenv, napi_callback_infoinfo) {
6286
napi_valuecallCount;
6387
NODE_API_CALL(env, napi_create_int32(env, deleterCallCount, &callCount));
@@ -171,6 +195,8 @@ static napi_value Init(napi_env env, napi_value exports) {
171195
napi_property_descriptormethods[] = {
172196
DECLARE_NODE_API_PROPERTY("newBuffer", newBuffer),
173197
DECLARE_NODE_API_PROPERTY("newExternalBuffer", newExternalBuffer),
198+
DECLARE_NODE_API_PROPERTY("newExternalSharedArrayBuffer",
199+
newExternalSharedArrayBuffer),
174200
DECLARE_NODE_API_PROPERTY("getDeleterCallCount", getDeleterCallCount),
175201
DECLARE_NODE_API_PROPERTY("copyBuffer", copyBuffer),
176202
DECLARE_NODE_API_PROPERTY("bufferHasInstance", bufferHasInstance),

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Commit 66de634
Browse files
bnoordhuisjuanarbol
bnoordhuis
authored and
juanarbol
committed
node-api: add napi_create_external_sharedarraybuffer
Creates a SharedArrayBuffer from externally managed memory.
Fixes: #62259
PR-URL: #62623
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Chengzhong Wu <legendecas@gmail.com>
Reviewed-By: Vladimir Morozov <vmorozov@microsoft.com>
Reviewed-By: Robert Nagy <ronagy@icloud.com>
Signed-off-by: Juan José Arboleda <soyjuanarbol@gmail.com>
1 parent e306521 commit 66de634
7 files changed
Lines changed: 132 additions & 2 deletions
File tree
‎doc/api/n-api.md‎
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2565,6 +2565,41 @@ object just created has been garbage collected.
25652565
JavaScript `ArrayBuffer`s are described in
25662566
[Section ArrayBuffer objects][] of the ECMAScript Language Specification.
25672567

2568+
#### `node_api_create_external_sharedarraybuffer`
2569+
2570+
<!-- YAML
2571+
added: REPLACEME
2572+
-->
2573+
2574+
```c
2575+
napi_status
2576+
node_api_create_external_sharedarraybuffer(napi_env env,
2577+
 void* external_data,
2578+
 size_t byte_length,
2579+
 node_api_noenv_finalize finalize_cb,
2580+
 void* finalize_hint,
2581+
 napi_value* result)
2582+
```
2583+
2584+
* `[in] env`: The environment that the API is invoked under.
2585+
* `[in] external_data`: Pointer to the underlying byte buffer of the
2586+
 `SharedArrayBuffer`.
2587+
* `[in] byte_length`: The length in bytes of the underlying buffer.
2588+
* `[in] finalize_cb`: Optional callback to call when the `SharedArrayBuffer` is
2589+
 being collected. Called on an arbitrary thread. Because a `SharedArrayBuffer`
2590+
 can outlive the environment it's created in, the callback does not receive a
2591+
 reference to `env`.
2592+
* `[in] finalize_hint`: Optional hint to pass to the finalize callback during
2593+
 collection.
2594+
* `[out] result`: A `napi_value` representing a JavaScript `SharedArrayBuffer`.
2595+
2596+
Returns `napi_ok` if the API succeeded.
2597+
2598+
Create a `SharedArrayBuffer` with externally managed memory.
2599+
2600+
See the entry on [`napi_create_external_arraybuffer`][] for runtime
2601+
compatibility.
2602+
25682603
#### `napi_create_external_buffer`
25692604

25702605
<!-- YAML
‎src/js_native_api.h‎
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -420,6 +420,16 @@ napi_create_external_arraybuffer(napi_env env,
420420
node_api_basic_finalizefinalize_cb,
421421
void*finalize_hint,
422422
napi_value*result);
423+
#ifdefNAPI_EXPERIMENTAL
424+
#defineNODE_API_EXPERIMENTAL_HAS_CREATE_EXTERNAL_SHAREDARRAYBUFFER
425+
NAPI_EXTERNnapi_statusNAPI_CDECL
426+
node_api_create_external_sharedarraybuffer(napi_envenv,
427+
void*external_data,
428+
size_tbyte_length,
429+
node_api_noenv_finalizefinalize_cb,
430+
void*finalize_hint,
431+
napi_value*result);
432+
#endif// NAPI_EXPERIMENTAL
423433
#endif// NODE_API_NO_EXTERNAL_BUFFERS_ALLOWED
424434
NAPI_EXTERNnapi_statusNAPI_CDECLnapi_get_arraybuffer_info(
425435
napi_envenv, napi_valuearraybuffer, void**data, size_t*byte_length);
‎src/js_native_api_types.h‎
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,10 @@ typedef void(NAPI_CDECL* node_api_nogc_finalize)(node_api_nogc_env env,
174174
#endif
175175
typedefnode_api_nogc_finalizenode_api_basic_finalize;
176176

177+
// A finalizer that can be called from any thread and at any time.
178+
typedefvoid(NAPI_CDECL*node_api_noenv_finalize)(void*finalize_data,
179+
void*finalize_hint);
180+
177181
typedefstruct {
178182
// One of utf8name or name should be NULL.
179183
constchar*utf8name;
‎src/js_native_api_v8.cc‎
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3068,6 +3068,48 @@ napi_create_external_arraybuffer(napi_env env,
30683068
 env, buffer, nullptr, nullptr, nullptr, result, nullptr);
30693069
}
30703070

3071+
napi_status NAPI_CDECL
3072+
node_api_create_external_sharedarraybuffer(napi_env env,
3073+
void* external_data,
3074+
size_t byte_length,
3075+
 node_api_noenv_finalize finalize_cb,
3076+
void* finalize_hint,
3077+
 napi_value* result) {
3078+
NAPI_PREAMBLE(env);
3079+
CHECK_ARG(env, result);
3080+
#ifdef V8_ENABLE_SANDBOX
3081+
returnnapi_set_last_error(env, napi_no_external_buffers_allowed);
3082+
#else
3083+
structFinalizerData {
3084+
void (*cb)(void* external_data, void* finalize_hint);
3085+
void* hint;
3086+
 };
3087+
auto deleter = [](void* external_data, size_t length, void* deleter_data) {
3088+
if (auto fd = static_cast<FinalizerData*>(deleter_data)) {
3089+
 fd->cb(external_data, fd->hint);
3090+
delete fd;
3091+
 }
3092+
 };
3093+
 FinalizerData* deleter_data = nullptr;
3094+
if (finalize_cb != nullptr) {
3095+
 deleter_data = new FinalizerData{finalize_cb, finalize_hint};
3096+
 }
3097+
auto unique_backing_store = v8::SharedArrayBuffer::NewBackingStore(
3098+
 external_data,
3099+
 byte_length,
3100+
 deleter,
3101+
reinterpret_cast<void*>(deleter_data));
3102+
CHECK(!!unique_backing_store); // Cannot fail.
3103+
auto shared_backing_store =
3104+
 std::shared_ptr<v8::BackingStore>(std::move(unique_backing_store));
3105+
auto shared_array_buffer =
3106+
v8::SharedArrayBuffer::New(env->isolate, std::move(shared_backing_store));
3107+
CHECK_MAYBE_EMPTY(env, shared_array_buffer, napi_generic_failure);
3108+
 *result = v8impl::JsValueFromV8LocalValue(shared_array_buffer);
3109+
returnnapi_clear_last_error(env);
3110+
#endif// V8_ENABLE_SANDBOX
3111+
}
3112+
30713113
napi_status NAPI_CDECLnapi_get_arraybuffer_info(napi_env env,
30723114
 napi_value arraybuffer,
30733115
void** data,
‎test/node-api/test_buffer/binding.gyp‎
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
 {
44
"target_name": "test_buffer",
55
"defines": [
6-
'NAPI_VERSION=10'
6+
"NAPI_EXPERIMENTAL",
7+
"NODE_API_EXPERIMENTAL_NO_WARNING"
78
 ],
89
"sources": [ "test_buffer.c" ]
910
 },
‎test/node-api/test_buffer/test.js‎
Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
constcommon=require('../../common');
55
constbinding=require(`./build/${common.buildType}/test_buffer`);
66
constassert=require('assert');
7-
consttick=require('util').promisify(require('../../common/tick'));
7+
constutil=require('util');
8+
consttick=util.promisify(require('../../common/tick'));
89

910
(asyncfunction(){
1011
assert.strictEqual(binding.newBuffer().toString(),binding.theText);
@@ -26,6 +27,17 @@ const tick = require('util').promisify(require('../../common/tick'));
2627
console.log('gc2');
2728
assert.strictEqual(binding.getDeleterCallCount(),2);
2829

30+
// Caveat emptor: it's indeterminate when the SharedArrayBuffer's backing
31+
// store is reclaimed; at least some of the time it happens even before
32+
// calling gc().
33+
letsab=binding.newExternalSharedArrayBuffer();
34+
assert(util.types.isSharedArrayBuffer(sab));
35+
sab=null;
36+
global.gc();
37+
awaittick(10);
38+
console.log('gc3');
39+
assert.strictEqual(binding.getDeleterCallCount(),3);
40+
2941
// To test this doesn't crash
3042
binding.invalidObjectAsBuffer({});
3143

‎test/node-api/test_buffer/test_buffer.c‎
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,30 @@ static napi_value newExternalBuffer(napi_env env, napi_callback_info info) {
5858
returntheBuffer;
5959
}
6060

61+
staticcharexternalSharedArrayBufferData[1];
62+
63+
staticvoidfreeExternalSharedArrayBuffer(void*data, void*hint) {
64+
 (void)hint;
65+
NODE_API_BASIC_ASSERT_RETURN_VOID(
66+
data== (void*)externalSharedArrayBufferData,
67+
"SharedArrayBuffer points to wrong data");
68+
deleterCallCount++;
69+
}
70+
71+
staticnapi_valuenewExternalSharedArrayBuffer(napi_envenv,
72+
napi_callback_infoinfo) {
73+
napi_valuesab;
74+
NODE_API_CALL(
75+
env,
76+
node_api_create_external_sharedarraybuffer(env,
77+
externalSharedArrayBufferData,
78+
1,
79+
freeExternalSharedArrayBuffer,
80+
NULL,
81+
&sab));
82+
returnsab;
83+
}
84+
6185
staticnapi_valuegetDeleterCallCount(napi_envenv, napi_callback_infoinfo) {
6286
napi_valuecallCount;
6387
NODE_API_CALL(env, napi_create_int32(env, deleterCallCount, &callCount));
@@ -171,6 +195,8 @@ static napi_value Init(napi_env env, napi_value exports) {
171195
napi_property_descriptormethods[] = {
172196
DECLARE_NODE_API_PROPERTY("newBuffer", newBuffer),
173197
DECLARE_NODE_API_PROPERTY("newExternalBuffer", newExternalBuffer),
198+
DECLARE_NODE_API_PROPERTY("newExternalSharedArrayBuffer",
199+
newExternalSharedArrayBuffer),
174200
DECLARE_NODE_API_PROPERTY("getDeleterCallCount", getDeleterCallCount),
175201
DECLARE_NODE_API_PROPERTY("copyBuffer", copyBuffer),
176202
DECLARE_NODE_API_PROPERTY("bufferHasInstance", bufferHasInstance),
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 66de634
Browse files
bnoordhuisjuanarbol
bnoordhuis
authored and
juanarbol
committed
node-api: add napi_create_external_sharedarraybuffer
Creates a SharedArrayBuffer from externally managed memory.
Fixes: #62259
PR-URL: #62623
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Chengzhong Wu <legendecas@gmail.com>
Reviewed-By: Vladimir Morozov <vmorozov@microsoft.com>
Reviewed-By: Robert Nagy <ronagy@icloud.com>
Signed-off-by: Juan José Arboleda <soyjuanarbol@gmail.com>
1 parent e306521 commit 66de634
7 files changed
Lines changed: 132 additions & 2 deletions
File tree
‎doc/api/n-api.md‎
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2565,6 +2565,41 @@ object just created has been garbage collected.
25652565
JavaScript `ArrayBuffer`s are described in
25662566
[Section ArrayBuffer objects][] of the ECMAScript Language Specification.
25672567

2568+
#### `node_api_create_external_sharedarraybuffer`
2569+
2570+
<!-- YAML
2571+
added: REPLACEME
2572+
-->
2573+
2574+
```c
2575+
napi_status
2576+
node_api_create_external_sharedarraybuffer(napi_env env,
2577+
 void* external_data,
2578+
 size_t byte_length,
2579+
 node_api_noenv_finalize finalize_cb,
2580+
 void* finalize_hint,
2581+
 napi_value* result)
2582+
```
2583+
2584+
* `[in] env`: The environment that the API is invoked under.
2585+
* `[in] external_data`: Pointer to the underlying byte buffer of the
2586+
 `SharedArrayBuffer`.
2587+
* `[in] byte_length`: The length in bytes of the underlying buffer.
2588+
* `[in] finalize_cb`: Optional callback to call when the `SharedArrayBuffer` is
2589+
 being collected. Called on an arbitrary thread. Because a `SharedArrayBuffer`
2590+
 can outlive the environment it's created in, the callback does not receive a
2591+
 reference to `env`.
2592+
* `[in] finalize_hint`: Optional hint to pass to the finalize callback during
2593+
 collection.
2594+
* `[out] result`: A `napi_value` representing a JavaScript `SharedArrayBuffer`.
2595+
2596+
Returns `napi_ok` if the API succeeded.
2597+
2598+
Create a `SharedArrayBuffer` with externally managed memory.
2599+
2600+
See the entry on [`napi_create_external_arraybuffer`][] for runtime
2601+
compatibility.
2602+
25682603
#### `napi_create_external_buffer`
25692604

25702605
<!-- YAML
‎src/js_native_api.h‎
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -420,6 +420,16 @@ napi_create_external_arraybuffer(napi_env env,
420420
node_api_basic_finalizefinalize_cb,
421421
void*finalize_hint,
422422
napi_value*result);
423+
#ifdefNAPI_EXPERIMENTAL
424+
#defineNODE_API_EXPERIMENTAL_HAS_CREATE_EXTERNAL_SHAREDARRAYBUFFER
425+
NAPI_EXTERNnapi_statusNAPI_CDECL
426+
node_api_create_external_sharedarraybuffer(napi_envenv,
427+
void*external_data,
428+
size_tbyte_length,
429+
node_api_noenv_finalizefinalize_cb,
430+
void*finalize_hint,
431+
napi_value*result);
432+
#endif// NAPI_EXPERIMENTAL
423433
#endif// NODE_API_NO_EXTERNAL_BUFFERS_ALLOWED
424434
NAPI_EXTERNnapi_statusNAPI_CDECLnapi_get_arraybuffer_info(
425435
napi_envenv, napi_valuearraybuffer, void**data, size_t*byte_length);
‎src/js_native_api_types.h‎
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,10 @@ typedef void(NAPI_CDECL* node_api_nogc_finalize)(node_api_nogc_env env,
174174
#endif
175175
typedefnode_api_nogc_finalizenode_api_basic_finalize;
176176

177+
// A finalizer that can be called from any thread and at any time.
178+
typedefvoid(NAPI_CDECL*node_api_noenv_finalize)(void*finalize_data,
179+
void*finalize_hint);
180+
177181
typedefstruct {
178182
// One of utf8name or name should be NULL.
179183
constchar*utf8name;
‎src/js_native_api_v8.cc‎
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3068,6 +3068,48 @@ napi_create_external_arraybuffer(napi_env env,
30683068
 env, buffer, nullptr, nullptr, nullptr, result, nullptr);
30693069
}
30703070

3071+
napi_status NAPI_CDECL
3072+
node_api_create_external_sharedarraybuffer(napi_env env,
3073+
void* external_data,
3074+
size_t byte_length,
3075+
 node_api_noenv_finalize finalize_cb,
3076+
void* finalize_hint,
3077+
 napi_value* result) {
3078+
NAPI_PREAMBLE(env);
3079+
CHECK_ARG(env, result);
3080+
#ifdef V8_ENABLE_SANDBOX
3081+
returnnapi_set_last_error(env, napi_no_external_buffers_allowed);
3082+
#else
3083+
structFinalizerData {
3084+
void (*cb)(void* external_data, void* finalize_hint);
3085+
void* hint;
3086+
 };
3087+
auto deleter = [](void* external_data, size_t length, void* deleter_data) {
3088+
if (auto fd = static_cast<FinalizerData*>(deleter_data)) {
3089+
 fd->cb(external_data, fd->hint);
3090+
delete fd;
3091+
 }
3092+
 };
3093+
 FinalizerData* deleter_data = nullptr;
3094+
if (finalize_cb != nullptr) {
3095+
 deleter_data = new FinalizerData{finalize_cb, finalize_hint};
3096+
 }
3097+
auto unique_backing_store = v8::SharedArrayBuffer::NewBackingStore(
3098+
 external_data,
3099+
 byte_length,
3100+
 deleter,
3101+
reinterpret_cast<void*>(deleter_data));
3102+
CHECK(!!unique_backing_store); // Cannot fail.
3103+
auto shared_backing_store =
3104+
 std::shared_ptr<v8::BackingStore>(std::move(unique_backing_store));
3105+
auto shared_array_buffer =
3106+
v8::SharedArrayBuffer::New(env->isolate, std::move(shared_backing_store));
3107+
CHECK_MAYBE_EMPTY(env, shared_array_buffer, napi_generic_failure);
3108+
 *result = v8impl::JsValueFromV8LocalValue(shared_array_buffer);
3109+
returnnapi_clear_last_error(env);
3110+
#endif// V8_ENABLE_SANDBOX
3111+
}
3112+
30713113
napi_status NAPI_CDECLnapi_get_arraybuffer_info(napi_env env,
30723114
 napi_value arraybuffer,
30733115
void** data,
‎test/node-api/test_buffer/binding.gyp‎
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
 {
44
"target_name": "test_buffer",
55
"defines": [
6-
'NAPI_VERSION=10'
6+
"NAPI_EXPERIMENTAL",
7+
"NODE_API_EXPERIMENTAL_NO_WARNING"
78
 ],
89
"sources": [ "test_buffer.c" ]
910
 },
‎test/node-api/test_buffer/test.js‎
Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
constcommon=require('../../common');
55
constbinding=require(`./build/${common.buildType}/test_buffer`);
66
constassert=require('assert');
7-
consttick=require('util').promisify(require('../../common/tick'));
7+
constutil=require('util');
8+
consttick=util.promisify(require('../../common/tick'));
89

910
(asyncfunction(){
1011
assert.strictEqual(binding.newBuffer().toString(),binding.theText);
@@ -26,6 +27,17 @@ const tick = require('util').promisify(require('../../common/tick'));
2627
console.log('gc2');
2728
assert.strictEqual(binding.getDeleterCallCount(),2);
2829

30+
// Caveat emptor: it's indeterminate when the SharedArrayBuffer's backing
31+
// store is reclaimed; at least some of the time it happens even before
32+
// calling gc().
33+
letsab=binding.newExternalSharedArrayBuffer();
34+
assert(util.types.isSharedArrayBuffer(sab));
35+
sab=null;
36+
global.gc();
37+
awaittick(10);
38+
console.log('gc3');
39+
assert.strictEqual(binding.getDeleterCallCount(),3);
40+
2941
// To test this doesn't crash
3042
binding.invalidObjectAsBuffer({});
3143

‎test/node-api/test_buffer/test_buffer.c‎
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,30 @@ static napi_value newExternalBuffer(napi_env env, napi_callback_info info) {
5858
returntheBuffer;
5959
}
6060

61+
staticcharexternalSharedArrayBufferData[1];
62+
63+
staticvoidfreeExternalSharedArrayBuffer(void*data, void*hint) {
64+
 (void)hint;
65+
NODE_API_BASIC_ASSERT_RETURN_VOID(
66+
data== (void*)externalSharedArrayBufferData,
67+
"SharedArrayBuffer points to wrong data");
68+
deleterCallCount++;
69+
}
70+
71+
staticnapi_valuenewExternalSharedArrayBuffer(napi_envenv,
72+
napi_callback_infoinfo) {
73+
napi_valuesab;
74+
NODE_API_CALL(
75+
env,
76+
node_api_create_external_sharedarraybuffer(env,
77+
externalSharedArrayBufferData,
78+
1,
79+
freeExternalSharedArrayBuffer,
80+
NULL,
81+
&sab));
82+
returnsab;
83+
}
84+
6185
staticnapi_valuegetDeleterCallCount(napi_envenv, napi_callback_infoinfo) {
6286
napi_valuecallCount;
6387
NODE_API_CALL(env, napi_create_int32(env, deleterCallCount, &callCount));
@@ -171,6 +195,8 @@ static napi_value Init(napi_env env, napi_value exports) {
171195
napi_property_descriptormethods[] = {
172196
DECLARE_NODE_API_PROPERTY("newBuffer", newBuffer),
173197
DECLARE_NODE_API_PROPERTY("newExternalBuffer", newExternalBuffer),
198+
DECLARE_NODE_API_PROPERTY("newExternalSharedArrayBuffer",
199+
newExternalSharedArrayBuffer),
174200
DECLARE_NODE_API_PROPERTY("getDeleterCallCount", getDeleterCallCount),
175201
DECLARE_NODE_API_PROPERTY("copyBuffer", copyBuffer),
176202
DECLARE_NODE_API_PROPERTY("bufferHasInstance", bufferHasInstance),
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 66de634
Browse files
bnoordhuisjuanarbol
bnoordhuis
authored and
juanarbol
committed
node-api: add napi_create_external_sharedarraybuffer
Creates a SharedArrayBuffer from externally managed memory.
Fixes: #62259
PR-URL: #62623
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Chengzhong Wu <legendecas@gmail.com>
Reviewed-By: Vladimir Morozov <vmorozov@microsoft.com>
Reviewed-By: Robert Nagy <ronagy@icloud.com>
Signed-off-by: Juan José Arboleda <soyjuanarbol@gmail.com>
1 parent e306521 commit 66de634
7 files changed
Lines changed: 132 additions & 2 deletions
File tree
‎doc/api/n-api.md‎
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2565,6 +2565,41 @@ object just created has been garbage collected.
25652565
JavaScript `ArrayBuffer`s are described in
25662566
[Section ArrayBuffer objects][] of the ECMAScript Language Specification.
25672567

2568+
#### `node_api_create_external_sharedarraybuffer`
2569+
2570+
<!-- YAML
2571+
added: REPLACEME
2572+
-->
2573+
2574+
```c
2575+
napi_status
2576+
node_api_create_external_sharedarraybuffer(napi_env env,
2577+
 void* external_data,
2578+
 size_t byte_length,
2579+
 node_api_noenv_finalize finalize_cb,
2580+
 void* finalize_hint,
2581+
 napi_value* result)
2582+
```
2583+
2584+
* `[in] env`: The environment that the API is invoked under.
2585+
* `[in] external_data`: Pointer to the underlying byte buffer of the
2586+
 `SharedArrayBuffer`.
2587+
* `[in] byte_length`: The length in bytes of the underlying buffer.
2588+
* `[in] finalize_cb`: Optional callback to call when the `SharedArrayBuffer` is
2589+
 being collected. Called on an arbitrary thread. Because a `SharedArrayBuffer`
2590+
 can outlive the environment it's created in, the callback does not receive a
2591+
 reference to `env`.
2592+
* `[in] finalize_hint`: Optional hint to pass to the finalize callback during
2593+
 collection.
2594+
* `[out] result`: A `napi_value` representing a JavaScript `SharedArrayBuffer`.
2595+
2596+
Returns `napi_ok` if the API succeeded.
2597+
2598+
Create a `SharedArrayBuffer` with externally managed memory.
2599+
2600+
See the entry on [`napi_create_external_arraybuffer`][] for runtime
2601+
compatibility.
2602+
25682603
#### `napi_create_external_buffer`
25692604

25702605
<!-- YAML
‎src/js_native_api.h‎
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -420,6 +420,16 @@ napi_create_external_arraybuffer(napi_env env,
420420
node_api_basic_finalizefinalize_cb,
421421
void*finalize_hint,
422422
napi_value*result);
423+
#ifdefNAPI_EXPERIMENTAL
424+
#defineNODE_API_EXPERIMENTAL_HAS_CREATE_EXTERNAL_SHAREDARRAYBUFFER
425+
NAPI_EXTERNnapi_statusNAPI_CDECL
426+
node_api_create_external_sharedarraybuffer(napi_envenv,
427+
void*external_data,
428+
size_tbyte_length,
429+
node_api_noenv_finalizefinalize_cb,
430+
void*finalize_hint,
431+
napi_value*result);
432+
#endif// NAPI_EXPERIMENTAL
423433
#endif// NODE_API_NO_EXTERNAL_BUFFERS_ALLOWED
424434
NAPI_EXTERNnapi_statusNAPI_CDECLnapi_get_arraybuffer_info(
425435
napi_envenv, napi_valuearraybuffer, void**data, size_t*byte_length);
‎src/js_native_api_types.h‎
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,10 @@ typedef void(NAPI_CDECL* node_api_nogc_finalize)(node_api_nogc_env env,
174174
#endif
175175
typedefnode_api_nogc_finalizenode_api_basic_finalize;
176176

177+
// A finalizer that can be called from any thread and at any time.
178+
typedefvoid(NAPI_CDECL*node_api_noenv_finalize)(void*finalize_data,
179+
void*finalize_hint);
180+
177181
typedefstruct {
178182
// One of utf8name or name should be NULL.
179183
constchar*utf8name;
‎src/js_native_api_v8.cc‎
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3068,6 +3068,48 @@ napi_create_external_arraybuffer(napi_env env,
30683068
 env, buffer, nullptr, nullptr, nullptr, result, nullptr);
30693069
}
30703070

3071+
napi_status NAPI_CDECL
3072+
node_api_create_external_sharedarraybuffer(napi_env env,
3073+
void* external_data,
3074+
size_t byte_length,
3075+
 node_api_noenv_finalize finalize_cb,
3076+
void* finalize_hint,
3077+
 napi_value* result) {
3078+
NAPI_PREAMBLE(env);
3079+
CHECK_ARG(env, result);
3080+
#ifdef V8_ENABLE_SANDBOX
3081+
returnnapi_set_last_error(env, napi_no_external_buffers_allowed);
3082+
#else
3083+
structFinalizerData {
3084+
void (*cb)(void* external_data, void* finalize_hint);
3085+
void* hint;
3086+
 };
3087+
auto deleter = [](void* external_data, size_t length, void* deleter_data) {
3088+
if (auto fd = static_cast<FinalizerData*>(deleter_data)) {
3089+
 fd->cb(external_data, fd->hint);
3090+
delete fd;
3091+
 }
3092+
 };
3093+
 FinalizerData* deleter_data = nullptr;
3094+
if (finalize_cb != nullptr) {
3095+
 deleter_data = new FinalizerData{finalize_cb, finalize_hint};
3096+
 }
3097+
auto unique_backing_store = v8::SharedArrayBuffer::NewBackingStore(
3098+
 external_data,
3099+
 byte_length,
3100+
 deleter,
3101+
reinterpret_cast<void*>(deleter_data));
3102+
CHECK(!!unique_backing_store); // Cannot fail.
3103+
auto shared_backing_store =
3104+
 std::shared_ptr<v8::BackingStore>(std::move(unique_backing_store));
3105+
auto shared_array_buffer =
3106+
v8::SharedArrayBuffer::New(env->isolate, std::move(shared_backing_store));
3107+
CHECK_MAYBE_EMPTY(env, shared_array_buffer, napi_generic_failure);
3108+
 *result = v8impl::JsValueFromV8LocalValue(shared_array_buffer);
3109+
returnnapi_clear_last_error(env);
3110+
#endif// V8_ENABLE_SANDBOX
3111+
}
3112+
30713113
napi_status NAPI_CDECLnapi_get_arraybuffer_info(napi_env env,
30723114
 napi_value arraybuffer,
30733115
void** data,
‎test/node-api/test_buffer/binding.gyp‎
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
 {
44
"target_name": "test_buffer",
55
"defines": [
6-
'NAPI_VERSION=10'
6+
"NAPI_EXPERIMENTAL",
7+
"NODE_API_EXPERIMENTAL_NO_WARNING"
78
 ],
89
"sources": [ "test_buffer.c" ]
910
 },
‎test/node-api/test_buffer/test.js‎
Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
constcommon=require('../../common');
55
constbinding=require(`./build/${common.buildType}/test_buffer`);
66
constassert=require('assert');
7-
consttick=require('util').promisify(require('../../common/tick'));
7+
constutil=require('util');
8+
consttick=util.promisify(require('../../common/tick'));
89

910
(asyncfunction(){
1011
assert.strictEqual(binding.newBuffer().toString(),binding.theText);
@@ -26,6 +27,17 @@ const tick = require('util').promisify(require('../../common/tick'));
2627
console.log('gc2');
2728
assert.strictEqual(binding.getDeleterCallCount(),2);
2829

30+
// Caveat emptor: it's indeterminate when the SharedArrayBuffer's backing
31+
// store is reclaimed; at least some of the time it happens even before
32+
// calling gc().
33+
letsab=binding.newExternalSharedArrayBuffer();
34+
assert(util.types.isSharedArrayBuffer(sab));
35+
sab=null;
36+
global.gc();
37+
awaittick(10);
38+
console.log('gc3');
39+
assert.strictEqual(binding.getDeleterCallCount(),3);
40+
2941
// To test this doesn't crash
3042
binding.invalidObjectAsBuffer({});
3143

‎test/node-api/test_buffer/test_buffer.c‎
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,30 @@ static napi_value newExternalBuffer(napi_env env, napi_callback_info info) {
5858
returntheBuffer;
5959
}
6060

61+
staticcharexternalSharedArrayBufferData[1];
62+
63+
staticvoidfreeExternalSharedArrayBuffer(void*data, void*hint) {
64+
 (void)hint;
65+
NODE_API_BASIC_ASSERT_RETURN_VOID(
66+
data== (void*)externalSharedArrayBufferData,
67+
"SharedArrayBuffer points to wrong data");
68+
deleterCallCount++;
69+
}
70+
71+
staticnapi_valuenewExternalSharedArrayBuffer(napi_envenv,
72+
napi_callback_infoinfo) {
73+
napi_valuesab;
74+
NODE_API_CALL(
75+
env,
76+
node_api_create_external_sharedarraybuffer(env,
77+
externalSharedArrayBufferData,
78+
1,
79+
freeExternalSharedArrayBuffer,
80+
NULL,
81+
&sab));
82+
returnsab;
83+
}
84+
6185
staticnapi_valuegetDeleterCallCount(napi_envenv, napi_callback_infoinfo) {
6286
napi_valuecallCount;
6387
NODE_API_CALL(env, napi_create_int32(env, deleterCallCount, &callCount));
@@ -171,6 +195,8 @@ static napi_value Init(napi_env env, napi_value exports) {
171195
napi_property_descriptormethods[] = {
172196
DECLARE_NODE_API_PROPERTY("newBuffer", newBuffer),
173197
DECLARE_NODE_API_PROPERTY("newExternalBuffer", newExternalBuffer),
198+
DECLARE_NODE_API_PROPERTY("newExternalSharedArrayBuffer",
199+
newExternalSharedArrayBuffer),
174200
DECLARE_NODE_API_PROPERTY("getDeleterCallCount", getDeleterCallCount),
175201
DECLARE_NODE_API_PROPERTY("copyBuffer", copyBuffer),
176202
DECLARE_NODE_API_PROPERTY("bufferHasInstance", bufferHasInstance),
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Commit 66de634
Browse files
bnoordhuisjuanarbol
bnoordhuis
authored and
juanarbol
committed
node-api: add napi_create_external_sharedarraybuffer
Creates a SharedArrayBuffer from externally managed memory.
Fixes: #62259
PR-URL: #62623
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Chengzhong Wu <legendecas@gmail.com>
Reviewed-By: Vladimir Morozov <vmorozov@microsoft.com>
Reviewed-By: Robert Nagy <ronagy@icloud.com>
Signed-off-by: Juan José Arboleda <soyjuanarbol@gmail.com>
1 parent e306521 commit 66de634
7 files changed
Lines changed: 132 additions & 2 deletions
File tree
‎doc/api/n-api.md‎
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2565,6 +2565,41 @@ object just created has been garbage collected.
25652565
JavaScript `ArrayBuffer`s are described in
25662566
[Section ArrayBuffer objects][] of the ECMAScript Language Specification.
25672567

2568+
#### `node_api_create_external_sharedarraybuffer`
2569+
2570+
<!-- YAML
2571+
added: REPLACEME
2572+
-->
2573+
2574+
```c
2575+
napi_status
2576+
node_api_create_external_sharedarraybuffer(napi_env env,
2577+
 void* external_data,
2578+
 size_t byte_length,
2579+
 node_api_noenv_finalize finalize_cb,
2580+
 void* finalize_hint,
2581+
 napi_value* result)
2582+
```
2583+
2584+
* `[in] env`: The environment that the API is invoked under.
2585+
* `[in] external_data`: Pointer to the underlying byte buffer of the
2586+
 `SharedArrayBuffer`.
2587+
* `[in] byte_length`: The length in bytes of the underlying buffer.
2588+
* `[in] finalize_cb`: Optional callback to call when the `SharedArrayBuffer` is
2589+
 being collected. Called on an arbitrary thread. Because a `SharedArrayBuffer`
2590+
 can outlive the environment it's created in, the callback does not receive a
2591+
 reference to `env`.
2592+
* `[in] finalize_hint`: Optional hint to pass to the finalize callback during
2593+
 collection.
2594+
* `[out] result`: A `napi_value` representing a JavaScript `SharedArrayBuffer`.
2595+
2596+
Returns `napi_ok` if the API succeeded.
2597+
2598+
Create a `SharedArrayBuffer` with externally managed memory.
2599+
2600+
See the entry on [`napi_create_external_arraybuffer`][] for runtime
2601+
compatibility.
2602+
25682603
#### `napi_create_external_buffer`
25692604

25702605
<!-- YAML
‎src/js_native_api.h‎
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -420,6 +420,16 @@ napi_create_external_arraybuffer(napi_env env,
420420
node_api_basic_finalizefinalize_cb,
421421
void*finalize_hint,
422422
napi_value*result);
423+
#ifdefNAPI_EXPERIMENTAL
424+
#defineNODE_API_EXPERIMENTAL_HAS_CREATE_EXTERNAL_SHAREDARRAYBUFFER
425+
NAPI_EXTERNnapi_statusNAPI_CDECL
426+
node_api_create_external_sharedarraybuffer(napi_envenv,
427+
void*external_data,
428+
size_tbyte_length,
429+
node_api_noenv_finalizefinalize_cb,
430+
void*finalize_hint,
431+
napi_value*result);
432+
#endif// NAPI_EXPERIMENTAL
423433
#endif// NODE_API_NO_EXTERNAL_BUFFERS_ALLOWED
424434
NAPI_EXTERNnapi_statusNAPI_CDECLnapi_get_arraybuffer_info(
425435
napi_envenv, napi_valuearraybuffer, void**data, size_t*byte_length);
‎src/js_native_api_types.h‎
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,10 @@ typedef void(NAPI_CDECL* node_api_nogc_finalize)(node_api_nogc_env env,
174174
#endif
175175
typedefnode_api_nogc_finalizenode_api_basic_finalize;
176176

177+
// A finalizer that can be called from any thread and at any time.
178+
typedefvoid(NAPI_CDECL*node_api_noenv_finalize)(void*finalize_data,
179+
void*finalize_hint);
180+
177181
typedefstruct {
178182
// One of utf8name or name should be NULL.
179183
constchar*utf8name;
‎src/js_native_api_v8.cc‎
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3068,6 +3068,48 @@ napi_create_external_arraybuffer(napi_env env,
30683068
 env, buffer, nullptr, nullptr, nullptr, result, nullptr);
30693069
}
30703070

3071+
napi_status NAPI_CDECL
3072+
node_api_create_external_sharedarraybuffer(napi_env env,
3073+
void* external_data,
3074+
size_t byte_length,
3075+
 node_api_noenv_finalize finalize_cb,
3076+
void* finalize_hint,
3077+
 napi_value* result) {
3078+
NAPI_PREAMBLE(env);
3079+
CHECK_ARG(env, result);
3080+
#ifdef V8_ENABLE_SANDBOX
3081+
returnnapi_set_last_error(env, napi_no_external_buffers_allowed);
3082+
#else
3083+
structFinalizerData {
3084+
void (*cb)(void* external_data, void* finalize_hint);
3085+
void* hint;
3086+
 };
3087+
auto deleter = [](void* external_data, size_t length, void* deleter_data) {
3088+
if (auto fd = static_cast<FinalizerData*>(deleter_data)) {
3089+
 fd->cb(external_data, fd->hint);
3090+
delete fd;
3091+
 }
3092+
 };
3093+
 FinalizerData* deleter_data = nullptr;
3094+
if (finalize_cb != nullptr) {
3095+
 deleter_data = new FinalizerData{finalize_cb, finalize_hint};
3096+
 }
3097+
auto unique_backing_store = v8::SharedArrayBuffer::NewBackingStore(
3098+
 external_data,
3099+
 byte_length,
3100+
 deleter,
3101+
reinterpret_cast<void*>(deleter_data));
3102+
CHECK(!!unique_backing_store); // Cannot fail.
3103+
auto shared_backing_store =
3104+
 std::shared_ptr<v8::BackingStore>(std::move(unique_backing_store));
3105+
auto shared_array_buffer =
3106+
v8::SharedArrayBuffer::New(env->isolate, std::move(shared_backing_store));
3107+
CHECK_MAYBE_EMPTY(env, shared_array_buffer, napi_generic_failure);
3108+
 *result = v8impl::JsValueFromV8LocalValue(shared_array_buffer);
3109+
returnnapi_clear_last_error(env);
3110+
#endif// V8_ENABLE_SANDBOX
3111+
}
3112+
30713113
napi_status NAPI_CDECLnapi_get_arraybuffer_info(napi_env env,
30723114
 napi_value arraybuffer,
30733115
void** data,
‎test/node-api/test_buffer/binding.gyp‎
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
 {
44
"target_name": "test_buffer",
55
"defines": [
6-
'NAPI_VERSION=10'
6+
"NAPI_EXPERIMENTAL",
7+
"NODE_API_EXPERIMENTAL_NO_WARNING"
78
 ],
89
"sources": [ "test_buffer.c" ]
910
 },
‎test/node-api/test_buffer/test.js‎
Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
constcommon=require('../../common');
55
constbinding=require(`./build/${common.buildType}/test_buffer`);
66
constassert=require('assert');
7-
consttick=require('util').promisify(require('../../common/tick'));
7+
constutil=require('util');
8+
consttick=util.promisify(require('../../common/tick'));
89

910
(asyncfunction(){
1011
assert.strictEqual(binding.newBuffer().toString(),binding.theText);
@@ -26,6 +27,17 @@ const tick = require('util').promisify(require('../../common/tick'));
2627
console.log('gc2');
2728
assert.strictEqual(binding.getDeleterCallCount(),2);
2829

30+
// Caveat emptor: it's indeterminate when the SharedArrayBuffer's backing
31+
// store is reclaimed; at least some of the time it happens even before
32+
// calling gc().
33+
letsab=binding.newExternalSharedArrayBuffer();
34+
assert(util.types.isSharedArrayBuffer(sab));
35+
sab=null;
36+
global.gc();
37+
awaittick(10);
38+
console.log('gc3');
39+
assert.strictEqual(binding.getDeleterCallCount(),3);
40+
2941
// To test this doesn't crash
3042
binding.invalidObjectAsBuffer({});
3143

‎test/node-api/test_buffer/test_buffer.c‎
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,30 @@ static napi_value newExternalBuffer(napi_env env, napi_callback_info info) {
5858
returntheBuffer;
5959
}
6060

61+
staticcharexternalSharedArrayBufferData[1];
62+
63+
staticvoidfreeExternalSharedArrayBuffer(void*data, void*hint) {
64+
 (void)hint;
65+
NODE_API_BASIC_ASSERT_RETURN_VOID(
66+
data== (void*)externalSharedArrayBufferData,
67+
"SharedArrayBuffer points to wrong data");
68+
deleterCallCount++;
69+
}
70+
71+
staticnapi_valuenewExternalSharedArrayBuffer(napi_envenv,
72+
napi_callback_infoinfo) {
73+
napi_valuesab;
74+
NODE_API_CALL(
75+
env,
76+
node_api_create_external_sharedarraybuffer(env,
77+
externalSharedArrayBufferData,
78+
1,
79+
freeExternalSharedArrayBuffer,
80+
NULL,
81+
&sab));
82+
returnsab;
83+
}
84+
6185
staticnapi_valuegetDeleterCallCount(napi_envenv, napi_callback_infoinfo) {
6286
napi_valuecallCount;
6387
NODE_API_CALL(env, napi_create_int32(env, deleterCallCount, &callCount));
@@ -171,6 +195,8 @@ static napi_value Init(napi_env env, napi_value exports) {
171195
napi_property_descriptormethods[] = {
172196
DECLARE_NODE_API_PROPERTY("newBuffer", newBuffer),
173197
DECLARE_NODE_API_PROPERTY("newExternalBuffer", newExternalBuffer),
198+
DECLARE_NODE_API_PROPERTY("newExternalSharedArrayBuffer",
199+
newExternalSharedArrayBuffer),
174200
DECLARE_NODE_API_PROPERTY("getDeleterCallCount", getDeleterCallCount),
175201
DECLARE_NODE_API_PROPERTY("copyBuffer", copyBuffer),
176202
DECLARE_NODE_API_PROPERTY("bufferHasInstance", bufferHasInstance),
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 66de634
Browse files
bnoordhuisjuanarbol
bnoordhuis
authored and
juanarbol
committed
node-api: add napi_create_external_sharedarraybuffer
Creates a SharedArrayBuffer from externally managed memory.
Fixes: #62259
PR-URL: #62623
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Chengzhong Wu <legendecas@gmail.com>
Reviewed-By: Vladimir Morozov <vmorozov@microsoft.com>
Reviewed-By: Robert Nagy <ronagy@icloud.com>
Signed-off-by: Juan José Arboleda <soyjuanarbol@gmail.com>
1 parent e306521 commit 66de634
7 files changed
Lines changed: 132 additions & 2 deletions
File tree
‎doc/api/n-api.md‎
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2565,6 +2565,41 @@ object just created has been garbage collected.
25652565
JavaScript `ArrayBuffer`s are described in
25662566
[Section ArrayBuffer objects][] of the ECMAScript Language Specification.
25672567

2568+
#### `node_api_create_external_sharedarraybuffer`
2569+
2570+
<!-- YAML
2571+
added: REPLACEME
2572+
-->
2573+
2574+
```c
2575+
napi_status
2576+
node_api_create_external_sharedarraybuffer(napi_env env,
2577+
 void* external_data,
2578+
 size_t byte_length,
2579+
 node_api_noenv_finalize finalize_cb,
2580+
 void* finalize_hint,
2581+
 napi_value* result)
2582+
```
2583+
2584+
* `[in] env`: The environment that the API is invoked under.
2585+
* `[in] external_data`: Pointer to the underlying byte buffer of the
2586+
 `SharedArrayBuffer`.
2587+
* `[in] byte_length`: The length in bytes of the underlying buffer.
2588+
* `[in] finalize_cb`: Optional callback to call when the `SharedArrayBuffer` is
2589+
 being collected. Called on an arbitrary thread. Because a `SharedArrayBuffer`
2590+
 can outlive the environment it's created in, the callback does not receive a
2591+
 reference to `env`.
2592+
* `[in] finalize_hint`: Optional hint to pass to the finalize callback during
2593+
 collection.
2594+
* `[out] result`: A `napi_value` representing a JavaScript `SharedArrayBuffer`.
2595+
2596+
Returns `napi_ok` if the API succeeded.
2597+
2598+
Create a `SharedArrayBuffer` with externally managed memory.
2599+
2600+
See the entry on [`napi_create_external_arraybuffer`][] for runtime
2601+
compatibility.
2602+
25682603
#### `napi_create_external_buffer`
25692604

25702605
<!-- YAML
‎src/js_native_api.h‎
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -420,6 +420,16 @@ napi_create_external_arraybuffer(napi_env env,
420420
node_api_basic_finalizefinalize_cb,
421421
void*finalize_hint,
422422
napi_value*result);
423+
#ifdefNAPI_EXPERIMENTAL
424+
#defineNODE_API_EXPERIMENTAL_HAS_CREATE_EXTERNAL_SHAREDARRAYBUFFER
425+
NAPI_EXTERNnapi_statusNAPI_CDECL
426+
node_api_create_external_sharedarraybuffer(napi_envenv,
427+
void*external_data,
428+
size_tbyte_length,
429+
node_api_noenv_finalizefinalize_cb,
430+
void*finalize_hint,
431+
napi_value*result);
432+
#endif// NAPI_EXPERIMENTAL
423433
#endif// NODE_API_NO_EXTERNAL_BUFFERS_ALLOWED
424434
NAPI_EXTERNnapi_statusNAPI_CDECLnapi_get_arraybuffer_info(
425435
napi_envenv, napi_valuearraybuffer, void**data, size_t*byte_length);
‎src/js_native_api_types.h‎
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,10 @@ typedef void(NAPI_CDECL* node_api_nogc_finalize)(node_api_nogc_env env,
174174
#endif
175175
typedefnode_api_nogc_finalizenode_api_basic_finalize;
176176

177+
// A finalizer that can be called from any thread and at any time.
178+
typedefvoid(NAPI_CDECL*node_api_noenv_finalize)(void*finalize_data,
179+
void*finalize_hint);
180+
177181
typedefstruct {
178182
// One of utf8name or name should be NULL.
179183
constchar*utf8name;
‎src/js_native_api_v8.cc‎
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3068,6 +3068,48 @@ napi_create_external_arraybuffer(napi_env env,
30683068
 env, buffer, nullptr, nullptr, nullptr, result, nullptr);
30693069
}
30703070

3071+
napi_status NAPI_CDECL
3072+
node_api_create_external_sharedarraybuffer(napi_env env,
3073+
void* external_data,
3074+
size_t byte_length,
3075+
 node_api_noenv_finalize finalize_cb,
3076+
void* finalize_hint,
3077+
 napi_value* result) {
3078+
NAPI_PREAMBLE(env);
3079+
CHECK_ARG(env, result);
3080+
#ifdef V8_ENABLE_SANDBOX
3081+
returnnapi_set_last_error(env, napi_no_external_buffers_allowed);
3082+
#else
3083+
structFinalizerData {
3084+
void (*cb)(void* external_data, void* finalize_hint);
3085+
void* hint;
3086+
 };
3087+
auto deleter = [](void* external_data, size_t length, void* deleter_data) {
3088+
if (auto fd = static_cast<FinalizerData*>(deleter_data)) {
3089+
 fd->cb(external_data, fd->hint);
3090+
delete fd;
3091+
 }
3092+
 };
3093+
 FinalizerData* deleter_data = nullptr;
3094+
if (finalize_cb != nullptr) {
3095+
 deleter_data = new FinalizerData{finalize_cb, finalize_hint};
3096+
 }
3097+
auto unique_backing_store = v8::SharedArrayBuffer::NewBackingStore(
3098+
 external_data,
3099+
 byte_length,
3100+
 deleter,
3101+
reinterpret_cast<void*>(deleter_data));
3102+
CHECK(!!unique_backing_store); // Cannot fail.
3103+
auto shared_backing_store =
3104+
 std::shared_ptr<v8::BackingStore>(std::move(unique_backing_store));
3105+
auto shared_array_buffer =
3106+
v8::SharedArrayBuffer::New(env->isolate, std::move(shared_backing_store));
3107+
CHECK_MAYBE_EMPTY(env, shared_array_buffer, napi_generic_failure);
3108+
 *result = v8impl::JsValueFromV8LocalValue(shared_array_buffer);
3109+
returnnapi_clear_last_error(env);
3110+
#endif// V8_ENABLE_SANDBOX
3111+
}
3112+
30713113
napi_status NAPI_CDECLnapi_get_arraybuffer_info(napi_env env,
30723114
 napi_value arraybuffer,
30733115
void** data,
‎test/node-api/test_buffer/binding.gyp‎
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
 {
44
"target_name": "test_buffer",
55
"defines": [
6-
'NAPI_VERSION=10'
6+
"NAPI_EXPERIMENTAL",
7+
"NODE_API_EXPERIMENTAL_NO_WARNING"
78
 ],
89
"sources": [ "test_buffer.c" ]
910
 },
‎test/node-api/test_buffer/test.js‎
Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
constcommon=require('../../common');
55
constbinding=require(`./build/${common.buildType}/test_buffer`);
66
constassert=require('assert');
7-
consttick=require('util').promisify(require('../../common/tick'));
7+
constutil=require('util');
8+
consttick=util.promisify(require('../../common/tick'));
89

910
(asyncfunction(){
1011
assert.strictEqual(binding.newBuffer().toString(),binding.theText);
@@ -26,6 +27,17 @@ const tick = require('util').promisify(require('../../common/tick'));
2627
console.log('gc2');
2728
assert.strictEqual(binding.getDeleterCallCount(),2);
2829

30+
// Caveat emptor: it's indeterminate when the SharedArrayBuffer's backing
31+
// store is reclaimed; at least some of the time it happens even before
32+
// calling gc().
33+
letsab=binding.newExternalSharedArrayBuffer();
34+
assert(util.types.isSharedArrayBuffer(sab));
35+
sab=null;
36+
global.gc();
37+
awaittick(10);
38+
console.log('gc3');
39+
assert.strictEqual(binding.getDeleterCallCount(),3);
40+
2941
// To test this doesn't crash
3042
binding.invalidObjectAsBuffer({});
3143

‎test/node-api/test_buffer/test_buffer.c‎
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,30 @@ static napi_value newExternalBuffer(napi_env env, napi_callback_info info) {
5858
returntheBuffer;
5959
}
6060

61+
staticcharexternalSharedArrayBufferData[1];
62+
63+
staticvoidfreeExternalSharedArrayBuffer(void*data, void*hint) {
64+
 (void)hint;
65+
NODE_API_BASIC_ASSERT_RETURN_VOID(
66+
data== (void*)externalSharedArrayBufferData,
67+
"SharedArrayBuffer points to wrong data");
68+
deleterCallCount++;
69+
}
70+
71+
staticnapi_valuenewExternalSharedArrayBuffer(napi_envenv,
72+
napi_callback_infoinfo) {
73+
napi_valuesab;
74+
NODE_API_CALL(
75+
env,
76+
node_api_create_external_sharedarraybuffer(env,
77+
externalSharedArrayBufferData,
78+
1,
79+
freeExternalSharedArrayBuffer,
80+
NULL,
81+
&sab));
82+
returnsab;
83+
}
84+
6185
staticnapi_valuegetDeleterCallCount(napi_envenv, napi_callback_infoinfo) {
6286
napi_valuecallCount;
6387
NODE_API_CALL(env, napi_create_int32(env, deleterCallCount, &callCount));
@@ -171,6 +195,8 @@ static napi_value Init(napi_env env, napi_value exports) {
171195
napi_property_descriptormethods[] = {
172196
DECLARE_NODE_API_PROPERTY("newBuffer", newBuffer),
173197
DECLARE_NODE_API_PROPERTY("newExternalBuffer", newExternalBuffer),
198+
DECLARE_NODE_API_PROPERTY("newExternalSharedArrayBuffer",
199+
newExternalSharedArrayBuffer),
174200
DECLARE_NODE_API_PROPERTY("getDeleterCallCount", getDeleterCallCount),
175201
DECLARE_NODE_API_PROPERTY("copyBuffer", copyBuffer),
176202
DECLARE_NODE_API_PROPERTY("bufferHasInstance", bufferHasInstance),
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 66de634
Browse files
bnoordhuisjuanarbol
bnoordhuis
authored and
juanarbol
committed
node-api: add napi_create_external_sharedarraybuffer
Creates a SharedArrayBuffer from externally managed memory.
Fixes: #62259
PR-URL: #62623
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Chengzhong Wu <legendecas@gmail.com>
Reviewed-By: Vladimir Morozov <vmorozov@microsoft.com>
Reviewed-By: Robert Nagy <ronagy@icloud.com>
Signed-off-by: Juan José Arboleda <soyjuanarbol@gmail.com>
1 parent e306521 commit 66de634
7 files changed
Lines changed: 132 additions & 2 deletions
File tree
‎doc/api/n-api.md‎
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2565,6 +2565,41 @@ object just created has been garbage collected.
25652565
JavaScript `ArrayBuffer`s are described in
25662566
[Section ArrayBuffer objects][] of the ECMAScript Language Specification.
25672567

2568+
#### `node_api_create_external_sharedarraybuffer`
2569+
2570+
<!-- YAML
2571+
added: REPLACEME
2572+
-->
2573+
2574+
```c
2575+
napi_status
2576+
node_api_create_external_sharedarraybuffer(napi_env env,
2577+
 void* external_data,
2578+
 size_t byte_length,
2579+
 node_api_noenv_finalize finalize_cb,
2580+
 void* finalize_hint,
2581+
 napi_value* result)
2582+
```
2583+
2584+
* `[in] env`: The environment that the API is invoked under.
2585+
* `[in] external_data`: Pointer to the underlying byte buffer of the
2586+
 `SharedArrayBuffer`.
2587+
* `[in] byte_length`: The length in bytes of the underlying buffer.
2588+
* `[in] finalize_cb`: Optional callback to call when the `SharedArrayBuffer` is
2589+
 being collected. Called on an arbitrary thread. Because a `SharedArrayBuffer`
2590+
 can outlive the environment it's created in, the callback does not receive a
2591+
 reference to `env`.
2592+
* `[in] finalize_hint`: Optional hint to pass to the finalize callback during
2593+
 collection.
2594+
* `[out] result`: A `napi_value` representing a JavaScript `SharedArrayBuffer`.
2595+
2596+
Returns `napi_ok` if the API succeeded.
2597+
2598+
Create a `SharedArrayBuffer` with externally managed memory.
2599+
2600+
See the entry on [`napi_create_external_arraybuffer`][] for runtime
2601+
compatibility.
2602+
25682603
#### `napi_create_external_buffer`
25692604

25702605
<!-- YAML
‎src/js_native_api.h‎
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -420,6 +420,16 @@ napi_create_external_arraybuffer(napi_env env,
420420
node_api_basic_finalizefinalize_cb,
421421
void*finalize_hint,
422422
napi_value*result);
423+
#ifdefNAPI_EXPERIMENTAL
424+
#defineNODE_API_EXPERIMENTAL_HAS_CREATE_EXTERNAL_SHAREDARRAYBUFFER
425+
NAPI_EXTERNnapi_statusNAPI_CDECL
426+
node_api_create_external_sharedarraybuffer(napi_envenv,
427+
void*external_data,
428+
size_tbyte_length,
429+
node_api_noenv_finalizefinalize_cb,
430+
void*finalize_hint,
431+
napi_value*result);
432+
#endif// NAPI_EXPERIMENTAL
423433
#endif// NODE_API_NO_EXTERNAL_BUFFERS_ALLOWED
424434
NAPI_EXTERNnapi_statusNAPI_CDECLnapi_get_arraybuffer_info(
425435
napi_envenv, napi_valuearraybuffer, void**data, size_t*byte_length);
‎src/js_native_api_types.h‎
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,10 @@ typedef void(NAPI_CDECL* node_api_nogc_finalize)(node_api_nogc_env env,
174174
#endif
175175
typedefnode_api_nogc_finalizenode_api_basic_finalize;
176176

177+
// A finalizer that can be called from any thread and at any time.
178+
typedefvoid(NAPI_CDECL*node_api_noenv_finalize)(void*finalize_data,
179+
void*finalize_hint);
180+
177181
typedefstruct {
178182
// One of utf8name or name should be NULL.
179183
constchar*utf8name;
‎src/js_native_api_v8.cc‎
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3068,6 +3068,48 @@ napi_create_external_arraybuffer(napi_env env,
30683068
 env, buffer, nullptr, nullptr, nullptr, result, nullptr);
30693069
}
30703070

3071+
napi_status NAPI_CDECL
3072+
node_api_create_external_sharedarraybuffer(napi_env env,
3073+
void* external_data,
3074+
size_t byte_length,
3075+
 node_api_noenv_finalize finalize_cb,
3076+
void* finalize_hint,
3077+
 napi_value* result) {
3078+
NAPI_PREAMBLE(env);
3079+
CHECK_ARG(env, result);
3080+
#ifdef V8_ENABLE_SANDBOX
3081+
returnnapi_set_last_error(env, napi_no_external_buffers_allowed);
3082+
#else
3083+
structFinalizerData {
3084+
void (*cb)(void* external_data, void* finalize_hint);
3085+
void* hint;
3086+
 };
3087+
auto deleter = [](void* external_data, size_t length, void* deleter_data) {
3088+
if (auto fd = static_cast<FinalizerData*>(deleter_data)) {
3089+
 fd->cb(external_data, fd->hint);
3090+
delete fd;
3091+
 }
3092+
 };
3093+
 FinalizerData* deleter_data = nullptr;
3094+
if (finalize_cb != nullptr) {
3095+
 deleter_data = new FinalizerData{finalize_cb, finalize_hint};
3096+
 }
3097+
auto unique_backing_store = v8::SharedArrayBuffer::NewBackingStore(
3098+
 external_data,
3099+
 byte_length,
3100+
 deleter,
3101+
reinterpret_cast<void*>(deleter_data));
3102+
CHECK(!!unique_backing_store); // Cannot fail.
3103+
auto shared_backing_store =
3104+
 std::shared_ptr<v8::BackingStore>(std::move(unique_backing_store));
3105+
auto shared_array_buffer =
3106+
v8::SharedArrayBuffer::New(env->isolate, std::move(shared_backing_store));
3107+
CHECK_MAYBE_EMPTY(env, shared_array_buffer, napi_generic_failure);
3108+
 *result = v8impl::JsValueFromV8LocalValue(shared_array_buffer);
3109+
returnnapi_clear_last_error(env);
3110+
#endif// V8_ENABLE_SANDBOX
3111+
}
3112+
30713113
napi_status NAPI_CDECLnapi_get_arraybuffer_info(napi_env env,
30723114
 napi_value arraybuffer,
30733115
void** data,
‎test/node-api/test_buffer/binding.gyp‎
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
 {
44
"target_name": "test_buffer",
55
"defines": [
6-
'NAPI_VERSION=10'
6+
"NAPI_EXPERIMENTAL",
7+
"NODE_API_EXPERIMENTAL_NO_WARNING"
78
 ],
89
"sources": [ "test_buffer.c" ]
910
 },
‎test/node-api/test_buffer/test.js‎
Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
constcommon=require('../../common');
55
constbinding=require(`./build/${common.buildType}/test_buffer`);
66
constassert=require('assert');
7-
consttick=require('util').promisify(require('../../common/tick'));
7+
constutil=require('util');
8+
consttick=util.promisify(require('../../common/tick'));
89

910
(asyncfunction(){
1011
assert.strictEqual(binding.newBuffer().toString(),binding.theText);
@@ -26,6 +27,17 @@ const tick = require('util').promisify(require('../../common/tick'));
2627
console.log('gc2');
2728
assert.strictEqual(binding.getDeleterCallCount(),2);
2829

30+
// Caveat emptor: it's indeterminate when the SharedArrayBuffer's backing
31+
// store is reclaimed; at least some of the time it happens even before
32+
// calling gc().
33+
letsab=binding.newExternalSharedArrayBuffer();
34+
assert(util.types.isSharedArrayBuffer(sab));
35+
sab=null;
36+
global.gc();
37+
awaittick(10);
38+
console.log('gc3');
39+
assert.strictEqual(binding.getDeleterCallCount(),3);
40+
2941
// To test this doesn't crash
3042
binding.invalidObjectAsBuffer({});
3143

‎test/node-api/test_buffer/test_buffer.c‎
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,30 @@ static napi_value newExternalBuffer(napi_env env, napi_callback_info info) {
5858
returntheBuffer;
5959
}
6060

61+
staticcharexternalSharedArrayBufferData[1];
62+
63+
staticvoidfreeExternalSharedArrayBuffer(void*data, void*hint) {
64+
 (void)hint;
65+
NODE_API_BASIC_ASSERT_RETURN_VOID(
66+
data== (void*)externalSharedArrayBufferData,
67+
"SharedArrayBuffer points to wrong data");
68+
deleterCallCount++;
69+
}
70+
71+
staticnapi_valuenewExternalSharedArrayBuffer(napi_envenv,
72+
napi_callback_infoinfo) {
73+
napi_valuesab;
74+
NODE_API_CALL(
75+
env,
76+
node_api_create_external_sharedarraybuffer(env,
77+
externalSharedArrayBufferData,
78+
1,
79+
freeExternalSharedArrayBuffer,
80+
NULL,
81+
&sab));
82+
returnsab;
83+
}
84+
6185
staticnapi_valuegetDeleterCallCount(napi_envenv, napi_callback_infoinfo) {
6286
napi_valuecallCount;
6387
NODE_API_CALL(env, napi_create_int32(env, deleterCallCount, &callCount));
@@ -171,6 +195,8 @@ static napi_value Init(napi_env env, napi_value exports) {
171195
napi_property_descriptormethods[] = {
172196
DECLARE_NODE_API_PROPERTY("newBuffer", newBuffer),
173197
DECLARE_NODE_API_PROPERTY("newExternalBuffer", newExternalBuffer),
198+
DECLARE_NODE_API_PROPERTY("newExternalSharedArrayBuffer",
199+
newExternalSharedArrayBuffer),
174200
DECLARE_NODE_API_PROPERTY("getDeleterCallCount", getDeleterCallCount),
175201
DECLARE_NODE_API_PROPERTY("copyBuffer", copyBuffer),
176202
DECLARE_NODE_API_PROPERTY("bufferHasInstance", bufferHasInstance),
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Commit 66de634
Browse files
bnoordhuisjuanarbol
bnoordhuis
authored and
juanarbol
committed
node-api: add napi_create_external_sharedarraybuffer
Creates a SharedArrayBuffer from externally managed memory.
Fixes: #62259
PR-URL: #62623
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Chengzhong Wu <legendecas@gmail.com>
Reviewed-By: Vladimir Morozov <vmorozov@microsoft.com>
Reviewed-By: Robert Nagy <ronagy@icloud.com>
Signed-off-by: Juan José Arboleda <soyjuanarbol@gmail.com>
1 parent e306521 commit 66de634
7 files changed
Lines changed: 132 additions & 2 deletions
File tree
‎doc/api/n-api.md‎
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2565,6 +2565,41 @@ object just created has been garbage collected.
25652565
JavaScript `ArrayBuffer`s are described in
25662566
[Section ArrayBuffer objects][] of the ECMAScript Language Specification.
25672567

2568+
#### `node_api_create_external_sharedarraybuffer`
2569+
2570+
<!-- YAML
2571+
added: REPLACEME
2572+
-->
2573+
2574+
```c
2575+
napi_status
2576+
node_api_create_external_sharedarraybuffer(napi_env env,
2577+
 void* external_data,
2578+
 size_t byte_length,
2579+
 node_api_noenv_finalize finalize_cb,
2580+
 void* finalize_hint,
2581+
 napi_value* result)
2582+
```
2583+
2584+
* `[in] env`: The environment that the API is invoked under.
2585+
* `[in] external_data`: Pointer to the underlying byte buffer of the
2586+
 `SharedArrayBuffer`.
2587+
* `[in] byte_length`: The length in bytes of the underlying buffer.
2588+
* `[in] finalize_cb`: Optional callback to call when the `SharedArrayBuffer` is
2589+
 being collected. Called on an arbitrary thread. Because a `SharedArrayBuffer`
2590+
 can outlive the environment it's created in, the callback does not receive a
2591+
 reference to `env`.
2592+
* `[in] finalize_hint`: Optional hint to pass to the finalize callback during
2593+
 collection.
2594+
* `[out] result`: A `napi_value` representing a JavaScript `SharedArrayBuffer`.
2595+
2596+
Returns `napi_ok` if the API succeeded.
2597+
2598+
Create a `SharedArrayBuffer` with externally managed memory.
2599+
2600+
See the entry on [`napi_create_external_arraybuffer`][] for runtime
2601+
compatibility.
2602+
25682603
#### `napi_create_external_buffer`
25692604

25702605
<!-- YAML
‎src/js_native_api.h‎
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -420,6 +420,16 @@ napi_create_external_arraybuffer(napi_env env,
420420
node_api_basic_finalizefinalize_cb,
421421
void*finalize_hint,
422422
napi_value*result);
423+
#ifdefNAPI_EXPERIMENTAL
424+
#defineNODE_API_EXPERIMENTAL_HAS_CREATE_EXTERNAL_SHAREDARRAYBUFFER
425+
NAPI_EXTERNnapi_statusNAPI_CDECL
426+
node_api_create_external_sharedarraybuffer(napi_envenv,
427+
void*external_data,
428+
size_tbyte_length,
429+
node_api_noenv_finalizefinalize_cb,
430+
void*finalize_hint,
431+
napi_value*result);
432+
#endif// NAPI_EXPERIMENTAL
423433
#endif// NODE_API_NO_EXTERNAL_BUFFERS_ALLOWED
424434
NAPI_EXTERNnapi_statusNAPI_CDECLnapi_get_arraybuffer_info(
425435
napi_envenv, napi_valuearraybuffer, void**data, size_t*byte_length);
‎src/js_native_api_types.h‎
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,10 @@ typedef void(NAPI_CDECL* node_api_nogc_finalize)(node_api_nogc_env env,
174174
#endif
175175
typedefnode_api_nogc_finalizenode_api_basic_finalize;
176176

177+
// A finalizer that can be called from any thread and at any time.
178+
typedefvoid(NAPI_CDECL*node_api_noenv_finalize)(void*finalize_data,
179+
void*finalize_hint);
180+
177181
typedefstruct {
178182
// One of utf8name or name should be NULL.
179183
constchar*utf8name;
‎src/js_native_api_v8.cc‎
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3068,6 +3068,48 @@ napi_create_external_arraybuffer(napi_env env,
30683068
 env, buffer, nullptr, nullptr, nullptr, result, nullptr);
30693069
}
30703070

3071+
napi_status NAPI_CDECL
3072+
node_api_create_external_sharedarraybuffer(napi_env env,
3073+
void* external_data,
3074+
size_t byte_length,
3075+
 node_api_noenv_finalize finalize_cb,
3076+
void* finalize_hint,
3077+
 napi_value* result) {
3078+
NAPI_PREAMBLE(env);
3079+
CHECK_ARG(env, result);
3080+
#ifdef V8_ENABLE_SANDBOX
3081+
returnnapi_set_last_error(env, napi_no_external_buffers_allowed);
3082+
#else
3083+
structFinalizerData {
3084+
void (*cb)(void* external_data, void* finalize_hint);
3085+
void* hint;
3086+
 };
3087+
auto deleter = [](void* external_data, size_t length, void* deleter_data) {
3088+
if (auto fd = static_cast<FinalizerData*>(deleter_data)) {
3089+
 fd->cb(external_data, fd->hint);
3090+
delete fd;
3091+
 }
3092+
 };
3093+
 FinalizerData* deleter_data = nullptr;
3094+
if (finalize_cb != nullptr) {
3095+
 deleter_data = new FinalizerData{finalize_cb, finalize_hint};
3096+
 }
3097+
auto unique_backing_store = v8::SharedArrayBuffer::NewBackingStore(
3098+
 external_data,
3099+
 byte_length,
3100+
 deleter,
3101+
reinterpret_cast<void*>(deleter_data));
3102+
CHECK(!!unique_backing_store); // Cannot fail.
3103+
auto shared_backing_store =
3104+
 std::shared_ptr<v8::BackingStore>(std::move(unique_backing_store));
3105+
auto shared_array_buffer =
3106+
v8::SharedArrayBuffer::New(env->isolate, std::move(shared_backing_store));
3107+
CHECK_MAYBE_EMPTY(env, shared_array_buffer, napi_generic_failure);
3108+
 *result = v8impl::JsValueFromV8LocalValue(shared_array_buffer);
3109+
returnnapi_clear_last_error(env);
3110+
#endif// V8_ENABLE_SANDBOX
3111+
}
3112+
30713113
napi_status NAPI_CDECLnapi_get_arraybuffer_info(napi_env env,
30723114
 napi_value arraybuffer,
30733115
void** data,
‎test/node-api/test_buffer/binding.gyp‎
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
 {
44
"target_name": "test_buffer",
55
"defines": [
6-
'NAPI_VERSION=10'
6+
"NAPI_EXPERIMENTAL",
7+
"NODE_API_EXPERIMENTAL_NO_WARNING"
78
 ],
89
"sources": [ "test_buffer.c" ]
910
 },
‎test/node-api/test_buffer/test.js‎
Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
constcommon=require('../../common');
55
constbinding=require(`./build/${common.buildType}/test_buffer`);
66
constassert=require('assert');
7-
consttick=require('util').promisify(require('../../common/tick'));
7+
constutil=require('util');
8+
consttick=util.promisify(require('../../common/tick'));
89

910
(asyncfunction(){
1011
assert.strictEqual(binding.newBuffer().toString(),binding.theText);
@@ -26,6 +27,17 @@ const tick = require('util').promisify(require('../../common/tick'));
2627
console.log('gc2');
2728
assert.strictEqual(binding.getDeleterCallCount(),2);
2829

30+
// Caveat emptor: it's indeterminate when the SharedArrayBuffer's backing
31+
// store is reclaimed; at least some of the time it happens even before
32+
// calling gc().
33+
letsab=binding.newExternalSharedArrayBuffer();
34+
assert(util.types.isSharedArrayBuffer(sab));
35+
sab=null;
36+
global.gc();
37+
awaittick(10);
38+
console.log('gc3');
39+
assert.strictEqual(binding.getDeleterCallCount(),3);
40+
2941
// To test this doesn't crash
3042
binding.invalidObjectAsBuffer({});
3143

‎test/node-api/test_buffer/test_buffer.c‎
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,30 @@ static napi_value newExternalBuffer(napi_env env, napi_callback_info info) {
5858
returntheBuffer;
5959
}
6060

61+
staticcharexternalSharedArrayBufferData[1];
62+
63+
staticvoidfreeExternalSharedArrayBuffer(void*data, void*hint) {
64+
 (void)hint;
65+
NODE_API_BASIC_ASSERT_RETURN_VOID(
66+
data== (void*)externalSharedArrayBufferData,
67+
"SharedArrayBuffer points to wrong data");
68+
deleterCallCount++;
69+
}
70+
71+
staticnapi_valuenewExternalSharedArrayBuffer(napi_envenv,
72+
napi_callback_infoinfo) {
73+
napi_valuesab;
74+
NODE_API_CALL(
75+
env,
76+
node_api_create_external_sharedarraybuffer(env,
77+
externalSharedArrayBufferData,
78+
1,
79+
freeExternalSharedArrayBuffer,
80+
NULL,
81+
&sab));
82+
returnsab;
83+
}
84+
6185
staticnapi_valuegetDeleterCallCount(napi_envenv, napi_callback_infoinfo) {
6286
napi_valuecallCount;
6387
NODE_API_CALL(env, napi_create_int32(env, deleterCallCount, &callCount));
@@ -171,6 +195,8 @@ static napi_value Init(napi_env env, napi_value exports) {
171195
napi_property_descriptormethods[] = {
172196
DECLARE_NODE_API_PROPERTY("newBuffer", newBuffer),
173197
DECLARE_NODE_API_PROPERTY("newExternalBuffer", newExternalBuffer),
198+
DECLARE_NODE_API_PROPERTY("newExternalSharedArrayBuffer",
199+
newExternalSharedArrayBuffer),
174200
DECLARE_NODE_API_PROPERTY("getDeleterCallCount", getDeleterCallCount),
175201
DECLARE_NODE_API_PROPERTY("copyBuffer", copyBuffer),
176202
DECLARE_NODE_API_PROPERTY("bufferHasInstance", bufferHasInstance),
0 commit comments
Comments
 (0)