foster/deno
0
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2025-03-03 17:34:47 -05:00
Code Issues Packages 1 Wiki Activity

Shared buffer fixes (#1644)

Browse source 
* makes `libdeno.shared` a `SharedArrayBuffer` instead of a regular `ArrayBuffer`.
* fixes `libdeno.shared` becoming undefined after accessing it once.
This commit is contained in:
Bert Belder 2019-02-08 20:32:17 -08:00 • committed by GitHub
parent 7380b19459
commit bbe2004f5d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
libdeno/binding.cc
View file

@ -316,14 +316,15 @@ void Shared(v8::Local<v8::Name> property,
if (d->shared_.data_ptr == nullptr) { if (d->shared_.data_ptr == nullptr) {
return; return;
} }
v8::Local<v8::ArrayBuffer> ab; v8::Local<v8::SharedArrayBuffer> ab;
if (d->shared_ab_.IsEmpty()) { if (d->shared_ab_.IsEmpty()) {
// Lazily initialize the persistent external ArrayBuffer. // Lazily initialize the persistent external ArrayBuffer.
ab = v8::ArrayBuffer::New(isolate, d->shared_.data_ptr, d->shared_.data_len, ab = v8::SharedArrayBuffer::New(isolate, d->shared_.data_ptr,
v8::ArrayBufferCreationMode::kExternalized); d->shared_.data_len,
v8::ArrayBufferCreationMode::kExternalized);
d->shared_ab_.Reset(isolate, ab); d->shared_ab_.Reset(isolate, ab);
} }
info.GetReturnValue().Set(ab); info.GetReturnValue().Set(d->shared_ab_);
} }
void DenoIsolate::ClearModules() { void DenoIsolate::ClearModules() {

3
libdeno/internal.h
View file

@ -46,6 +46,7 @@ class DenoIsolate {
} }
~DenoIsolate() { ~DenoIsolate() {
shared_ab_.Reset();
if (snapshot_creator_) { if (snapshot_creator_) {
delete snapshot_creator_; delete snapshot_creator_;
} else { } else {
@ -98,7 +99,7 @@ class DenoIsolate {
v8::Persistent<v8::Function> recv_; v8::Persistent<v8::Function> recv_;
v8::StartupData snapshot_; v8::StartupData snapshot_;
v8::Persistent<v8::ArrayBuffer> global_import_buf_; v8::Persistent<v8::ArrayBuffer> global_import_buf_;
v8::Persistent<v8::ArrayBuffer> shared_ab_; v8::Persistent<v8::SharedArrayBuffer> shared_ab_;
}; };
class UserDataScope { class UserDataScope {

13
libdeno/libdeno_test.cc
View file

@ -289,3 +289,16 @@ TEST(LibDenoTest, Utf8Bug) {
EXPECT_EQ(nullptr, deno_last_exception(d)); EXPECT_EQ(nullptr, deno_last_exception(d));
deno_delete(d); deno_delete(d);
} }
TEST(LibDenoTest, SharedAtomics) {
int32_t s[] = {0, 1, 2};
deno_buf shared = {nullptr, 0, reinterpret_cast<uint8_t*>(s), sizeof s};
Deno* d = deno_new(deno_config{0, empty, shared, nullptr});
deno_execute(d, nullptr, "a.js",
"Atomics.add(new Int32Array(libdeno.shared), 0, 1)");
EXPECT_EQ(nullptr, deno_last_exception(d));
EXPECT_EQ(s[0], 1);
EXPECT_EQ(s[1], 1);
EXPECT_EQ(s[2], 2);
deno_delete(d);
}

3
libdeno/libdeno_test.js
View file

@ -136,7 +136,8 @@ global.CheckPromiseErrors = () => {
global.Shared = () => { global.Shared = () => {
const ab = libdeno.shared; const ab = libdeno.shared;
assert(ab instanceof ArrayBuffer); assert(ab instanceof SharedArrayBuffer);
assert(libdeno.shared != undefined);
assert(ab.byteLength === 3); assert(ab.byteLength === 3);
const ui8 = new Uint8Array(ab); const ui8 = new Uint8Array(ab);
assert(ui8[0] === 0); assert(ui8[0] === 0);