FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

src: support V8 experimental shared values in messaging · nodejs/node@4293cc4 · GitHub

/ node Public

Commit 4293cc4

Browse files
syg
authored and
targos
committed
src: support V8 experimental shared values in messaging
PR-URL: #47706 Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net>
1 parent e22c686 commit 4293cc4

3 files changed

Lines changed: 56 additions & 4 deletions

File tree

‎src/node_messaging.cc‎

Lines changed: 27 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ using v8::MaybeLocal;
3131
using v8::Nothing;
3232
using v8::Object;
3333
using v8::SharedArrayBuffer;
34+
using v8::SharedValueConveyor;
3435
using v8::String;
3536
using v8::Symbol;
3637
using v8::Value;
@@ -92,10 +93,12 @@ class DeserializerDelegate : public ValueDeserializer::Delegate {
9293
Environment* env,
9394
const std::vector<BaseObjectPtr<BaseObject>>& host_objects,
9495
const std::vector<Local<SharedArrayBuffer>>& shared_array_buffers,
95-
const std::vector<CompiledWasmModule>& wasm_modules)
96+
const std::vector<CompiledWasmModule>& wasm_modules,
97+
const std::optional<SharedValueConveyor>& shared_value_conveyor)
9698
: host_objects_(host_objects),
9799
shared_array_buffers_(shared_array_buffers),
98-
wasm_modules_(wasm_modules) {}
100+
wasm_modules_(wasm_modules),
101+
shared_value_conveyor_(shared_value_conveyor) {}
99102

100103
MaybeLocal<Object> ReadHostObject(Isolate* isolate) override {
101104
// Identifying the index in the message's BaseObject array is sufficient.
@@ -128,12 +131,18 @@ class DeserializerDelegate : public ValueDeserializer::Delegate {
128131
isolate, wasm_modules_[transfer_id]);
129132
}
130133

134+
const SharedValueConveyor* GetSharedValueConveyor(Isolate* isolate) override {
135+
CHECK(shared_value_conveyor_.has_value());
136+
return &shared_value_conveyor_.value();
137+
}
138+
131139
ValueDeserializer* deserializer = nullptr;
132140

133141
private:
134142
const std::vector<BaseObjectPtr<BaseObject>>& host_objects_;
135143
const std::vector<Local<SharedArrayBuffer>>& shared_array_buffers_;
136144
const std::vector<CompiledWasmModule>& wasm_modules_;
145+
const std::optional<SharedValueConveyor>& shared_value_conveyor_;
137146
};
138147

139148
} // anonymous namespace
@@ -198,8 +207,12 @@ MaybeLocal<Value> Message::Deserialize(Environment* env,
198207
shared_array_buffers.push_back(sab);
199208
}
200209

201-
DeserializerDelegate delegate(
202-
this, env, host_objects, shared_array_buffers, wasm_modules_);
210+
DeserializerDelegate delegate(this,
211+
env,
212+
host_objects,
213+
shared_array_buffers,
214+
wasm_modules_,
215+
shared_value_conveyor_);
203216
ValueDeserializer deserializer(
204217
env->isolate(),
205218
reinterpret_cast<const uint8_t*>(main_message_buf_.data),
@@ -243,6 +256,10 @@ uint32_t Message::AddWASMModule(CompiledWasmModule&& mod) {
243256
return wasm_modules_.size() - 1;
244257
}
245258

259+
void Message::AdoptSharedValueConveyor(SharedValueConveyor&& conveyor) {
260+
shared_value_conveyor_.emplace(std::move(conveyor));
261+
}
262+
246263
namespace {
247264

248265
MaybeLocal<Function> GetEmitMessageFunction(Local<Context> context) {
@@ -347,6 +364,12 @@ class SerializerDelegate : public ValueSerializer::Delegate {
347364
return Just(msg_->AddWASMModule(module->GetCompiledModule()));
348365
}
349366

367+
bool AdoptSharedValueConveyor(Isolate* isolate,
368+
SharedValueConveyor&& conveyor) override {
369+
msg_->AdoptSharedValueConveyor(std::move(conveyor));
370+
return true;
371+
}
372+
350373
Maybe<bool> Finish(Local<Context> context) {
351374
for (uint32_t i = 0; i < host_objects_.size(); i++) {
352375
BaseObjectPtr<BaseObject> host_object = std::move(host_objects_[i]);

‎src/node_messaging.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,9 @@ class Message : public MemoryRetainer {
8888
// Internal method of Message that is called when a new WebAssembly.Module
8989
// object is encountered in the incoming value's structure.
9090
uint32_t AddWASMModule(v8::CompiledWasmModule&& mod);
91+
// Internal method of Message that is called when a shared value is
92+
// encountered for the first time in the incoming value's structure.
93+
void AdoptSharedValueConveyor(v8::SharedValueConveyor&& conveyor);
9194

9295
// The host objects that will be transferred, as recorded by Serialize()
9396
// (e.g. MessagePorts).
@@ -114,6 +117,7 @@ class Message : public MemoryRetainer {
114117
std::vector<std::shared_ptr<v8::BackingStore>> shared_array_buffers_;
115118
std::vector<std::unique_ptr<TransferData>> transferables_;
116119
std::vector<v8::CompiledWasmModule> wasm_modules_;
120+
std::optional<v8::SharedValueConveyor> shared_value_conveyor_;
117121

118122
friend class MessagePort;
119123
};

‎test/parallel/test-experimental-shared-value-conveyor.js‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
'use strict';
2+
3+
// Flags: --harmony-struct
4+
5+
const common = require('../common');
6+
const assert = require('assert');
7+
const { Worker, parentPort } = require('worker_threads');
8+
9+
// Do not use isMainThread so that this test itself can be run inside a Worker.
10+
if (!process.env.HAS_STARTED_WORKER) {
11+
process.env.HAS_STARTED_WORKER = 1;
12+
const m = new globalThis.SharedArray(16);
13+
14+
const worker = new Worker(__filename);
15+
worker.once('message', common.mustCall((message) => {
16+
assert.strictEqual(message, m);
17+
}));
18+
19+
worker.postMessage(m);
20+
} else {
21+
parentPort.once('message', common.mustCall((message) => {
22+
// Simple echo.
23+
parentPort.postMessage(message);
24+
}));
25+
}

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL