summaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorBert Belder <bertbelder@gmail.com>2018-07-09 03:35:34 +0200
committerBert Belder <bertbelder@gmail.com>2018-07-12 21:26:38 +0200
commit24b0e91d8096f84a114f662e3eb42c83d0d3878d (patch)
treeacd9ae306618276020e75450c064ead463e64387 /js
parentbbcd4c8dd33121868d82123a3d36e3df282af45f (diff)
Move buffers between V8 and native
* send()/recv() now operate on TypedArrays rather than ArrayBuffers. * Remove a copy (through ArrayBuffer.slice()) from the send path. * Remove a copy (through v8::ArrayBuffer::New()) from the return path. * After moving a buffer from JS to native, the ArrayBuffer object and it's views are made inaccessible ('neutered'). * `struct deno_buf` now holds two [ptr, length] tuples, one for the actual memory allocation, and one for the logical data contained therein. This is necessary because flatbuffers fills it's buffer bottom-up, so the serialized blob doesn't start at beginning of the buffer, but somewhere in the middle.
Diffstat (limited to 'js')
-rw-r--r--js/deno.d.ts4
-rw-r--r--js/main.ts13
-rw-r--r--js/mock_runtime.js81
3 files changed, 69 insertions, 29 deletions
diff --git a/js/deno.d.ts b/js/deno.d.ts
index f554135bc..a54dab851 100644
--- a/js/deno.d.ts
+++ b/js/deno.d.ts
@@ -1,10 +1,10 @@
// Copyright 2018 Ryan Dahl <ry@tinyclouds.org>
// All rights reserved. MIT License.
-type MessageCallback = (msg: ArrayBuffer) => void;
+type MessageCallback = (msg: Uint8Array) => void;
interface Deno {
recv(cb: MessageCallback): void;
- send(msg: ArrayBuffer): null | ArrayBuffer;
+ send(msg: ArrayBufferView): null | Uint8Array;
print(x: string): void;
}
diff --git a/js/main.ts b/js/main.ts
index 027baa3cf..379b69c97 100644
--- a/js/main.ts
+++ b/js/main.ts
@@ -19,7 +19,7 @@ function assignCmdId(): number {
return cmdId;
}
-function startMsg(cmdId: number): ArrayBuffer {
+function startMsg(cmdId: number): Uint8Array {
const builder = new flatbuffers.Builder();
const msg = fbs.Start.createStart(builder, 0);
fbs.Base.startBase(builder);
@@ -27,7 +27,7 @@ function startMsg(cmdId: number): ArrayBuffer {
fbs.Base.addMsg(builder, msg);
fbs.Base.addMsgType(builder, fbs.Any.Start);
builder.finish(fbs.Base.endBase(builder));
- return typedArrayToArrayBuffer(builder.asUint8Array());
+ return builder.asUint8Array();
}
window["denoMain"] = () => {
@@ -47,7 +47,7 @@ window["denoMain"] = () => {
}
// Deserialize res into startResMsg.
- const bb = new flatbuffers.ByteBuffer(new Uint8Array(res));
+ const bb = new flatbuffers.ByteBuffer(res);
const base = fbs.Base.getRootAsBase(bb);
assert(base.cmdId() === cmdId);
assert(fbs.Any.StartRes === base.msgType());
@@ -69,10 +69,3 @@ window["denoMain"] = () => {
mod.compileAndRun();
*/
};
-
-function typedArrayToArrayBuffer(ta: Uint8Array): ArrayBuffer {
- return ta.buffer.slice(
- ta.byteOffset,
- ta.byteOffset + ta.byteLength
- ) as ArrayBuffer;
-}
diff --git a/js/mock_runtime.js b/js/mock_runtime.js
index 66a34657e..934fbeab4 100644
--- a/js/mock_runtime.js
+++ b/js/mock_runtime.js
@@ -7,10 +7,6 @@ function assert(cond) {
if (!cond) throw Error("mock_runtime.js assert failed");
}
-global.typedArrayToArrayBuffer = ta => {
- return ta.buffer.slice(ta.byteOffset, ta.byteOffset + ta.byteLength);
-};
-
global.CanCallFunction = () => {
deno.print("Hello world from foo");
return "foo";
@@ -41,22 +37,20 @@ global.SendByteLength = () => {
};
global.RecvReturnEmpty = () => {
- const ui8 = new Uint8Array("abc".split("").map(c => c.charCodeAt(0)));
- const ab = typedArrayToArrayBuffer(ui8);
- let r = deno.send(ab);
- assert(r == null);
- r = deno.send(ab);
- assert(r == null);
+ const m1 = new Uint8Array("abc".split("").map(c => c.charCodeAt(0)));
+ const m2 = m1.slice();
+ const r1 = deno.send(m1);
+ assert(r1 == null);
+ const r2 = deno.send(m2);
+ assert(r2 == null);
};
global.RecvReturnBar = () => {
- const ui8 = new Uint8Array("abc".split("").map(c => c.charCodeAt(0)));
- const ab = typedArrayToArrayBuffer(ui8);
- const r = deno.send(ab);
- assert(r instanceof ArrayBuffer);
+ const m = new Uint8Array("abc".split("").map(c => c.charCodeAt(0)));
+ const r = deno.send(m);
+ assert(r instanceof Uint8Array);
assert(r.byteLength === 3);
- const rui8 = new Uint8Array(r);
- const rstr = String.fromCharCode(...rui8);
+ const rstr = String.fromCharCode(...r);
assert(rstr === "bar");
};
@@ -67,6 +61,59 @@ global.DoubleRecvFails = () => {
deno.recv((channel, msg) => assert(false));
};
+global.SendRecvSlice = () => {
+ const abLen = 1024;
+ let buf = new Uint8Array(abLen);
+ for (let i = 0; i < 5; i++) {
+ // Set first and last byte, for verification by the native side.
+ buf[0] = 100 + i;
+ buf[buf.length - 1] = 100 - i;
+ // On the native side, the slice is shortened by 19 bytes.
+ buf = deno.send(buf);
+ assert(buf.byteOffset === i * 11);
+ assert(buf.byteLength === abLen - i * 30 - 19);
+ assert(buf.buffer.byteLength == abLen);
+ // Look for values written by the backend.
+ assert(buf[0] === 200 + i);
+ assert(buf[buf.length - 1] === 200 - i);
+ // On the JS side, the start of the slice is moved up by 11 bytes.
+ buf = buf.subarray(11);
+ assert(buf.byteOffset === (i + 1) * 11);
+ assert(buf.byteLength === abLen - (i + 1) * 30);
+ }
+};
+
+global.JSSendArrayBufferViewTypes = () => {
+ // Test that ArrayBufferView slices are transferred correctly.
+ // Send Uint8Array.
+ const ab1 = new ArrayBuffer(4321);
+ const u8 = new Uint8Array(ab1, 2468, 1000);
+ u8[0] = 1;
+ deno.send(u8);
+ // Send Uint32Array.
+ const ab2 = new ArrayBuffer(4321);
+ const u32 = new Uint32Array(ab2, 2468, 1000 / Uint32Array.BYTES_PER_ELEMENT);
+ u32[0] = 0x02020202;
+ deno.send(u32);
+ // Send DataView.
+ const ab3 = new ArrayBuffer(4321);
+ const dv = new DataView(ab3, 2468, 1000);
+ dv.setUint8(0, 3);
+ deno.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 = deno.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.
[].join("");
@@ -82,7 +129,7 @@ global.ErrorHandling = () => {
assert(line === 3);
assert(col === 1);
assert(error instanceof Error);
- deno.send(typedArrayToArrayBuffer(new Uint8Array([42])));
+ deno.send(new Uint8Array([42]));
};
eval("\n\n notdefined()\n//# sourceURL=helloworld.js");
};