foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-11-26 16:09:27 -05:00
Code Issues Packages 1 Wiki Activity

libdeno.send(): Use GetContents instead of Externalize

Browse source 
Fixes #744.
This commit is contained in:
Ryan Dahl 2018-09-19 08:24:34 -07:00
parent f42849744b
commit 234d5ea780
3 changed files with 4 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
libdeno/binding.cc
View file

@ -168,25 +168,18 @@ static v8::Local<v8::Uint8Array> ImportBuf(v8::Isolate* isolate, deno_buf buf) {
} }
} }
static deno_buf ExportBuf(v8::Isolate* isolate, static deno_buf GetContents(v8::Isolate* isolate,
v8::Local<v8::ArrayBufferView> view) { v8::Local<v8::ArrayBufferView> view) {
auto ab = view->Buffer(); auto ab = view->Buffer();
auto contents = ab->Externalize(); auto contents = ab->GetContents();
deno_buf buf; deno_buf buf;
buf.alloc_ptr = reinterpret_cast<uint8_t*>(contents.Data()); buf.alloc_ptr = reinterpret_cast<uint8_t*>(contents.Data());
buf.alloc_len = contents.ByteLength(); buf.alloc_len = contents.ByteLength();
buf.data_ptr = buf.alloc_ptr + view->ByteOffset(); buf.data_ptr = buf.alloc_ptr + view->ByteOffset();
buf.data_len = view->ByteLength(); buf.data_len = view->ByteLength();
// Prevent JS from modifying buffer contents after exporting.
ab->Neuter();
return buf; return buf;
} }
static void FreeBuf(deno_buf buf) { free(buf.alloc_ptr); }
// Sets the recv callback. // Sets the recv callback.
void Recv(const v8::FunctionCallbackInfo<v8::Value>& args) { void Recv(const v8::FunctionCallbackInfo<v8::Value>& args) {
v8::Isolate* isolate = args.GetIsolate(); v8::Isolate* isolate = args.GetIsolate();
@ -218,20 +211,13 @@ void Send(const v8::FunctionCallbackInfo<v8::Value>& args) {
CHECK_EQ(args.Length(), 1); CHECK_EQ(args.Length(), 1);
v8::Local<v8::Value> ab_v = args[0]; v8::Local<v8::Value> ab_v = args[0];
CHECK(ab_v->IsArrayBufferView()); CHECK(ab_v->IsArrayBufferView());
auto buf = ExportBuf(isolate, v8::Local<v8::ArrayBufferView>::Cast(ab_v)); auto buf = GetContents(isolate, v8::Local<v8::ArrayBufferView>::Cast(ab_v));
DCHECK_EQ(d->currentArgs, nullptr); DCHECK_EQ(d->currentArgs, nullptr);
d->currentArgs = &args; d->currentArgs = &args;
d->cb(d, buf); d->cb(d, buf);
// Buffer is only valid until the end of the callback.
// TODO(piscisaureus):
// It's possible that data in the buffer is needed after the callback
// returns, e.g. when the handler offloads work to a thread pool, therefore
// make the callback responsible for releasing the buffer.
FreeBuf(buf);
d->currentArgs = nullptr; d->currentArgs = nullptr;
} }

12
libdeno/libdeno_test.cc
View file

@ -152,18 +152,6 @@ TEST(LibDenoTest, JSSendArrayBufferViewTypes) {
deno_delete(d); deno_delete(d);
} }
TEST(LibDenoTest, JSSendNeutersBuffer) {
static int count = 0;
Deno* d = deno_new(nullptr, [](auto _, auto buf) {
count++;
EXPECT_EQ(buf.data_len, 1u);
EXPECT_EQ(buf.data_ptr[0], 42);
});
EXPECT_TRUE(deno_execute(d, "a.js", "JSSendNeutersBuffer()"));
EXPECT_EQ(count, 1);
deno_delete(d);
}
TEST(LibDenoTest, TypedArraySnapshots) { TEST(LibDenoTest, TypedArraySnapshots) {
Deno* d = deno_new(nullptr, nullptr); Deno* d = deno_new(nullptr, nullptr);
EXPECT_TRUE(deno_execute(d, "a.js", "TypedArraySnapshots()")); EXPECT_TRUE(deno_execute(d, "a.js", "TypedArraySnapshots()"));

12
libdeno/libdeno_test.js
View file

@ -103,18 +103,6 @@ global.JSSendArrayBufferViewTypes = () => {
libdeno.send(dv); libdeno.send(dv);
}; };
global.JSSendNeutersBuffer = () => {
// Buffer should be neutered after transferring it to the native side.
const u8 = new Uint8Array([42]);
assert(u8.byteLength === 1);
assert(u8.buffer.byteLength === 1);
assert(u8[0] === 42);
const r = libdeno.send(u8);
assert(u8.byteLength === 0);
assert(u8.buffer.byteLength === 0);
assert(u8[0] === undefined);
};
// The following join has caused SnapshotBug to segfault when using kKeep. // The following join has caused SnapshotBug to segfault when using kKeep.
[].join(""); [].join("");