Skip to content

worker: fix broadcast channel SharedArrayBuffer passing #36501

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
addaleax wants to merge 1 commit into from
Closed

worker: fix broadcast channel SharedArrayBuffer passing #36501

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
worker: fix broadcast channel SharedArrayBuffer passing 
Make sure that `SharedArrayBuffer`s can be deserialized on multiple
receiving ends. As a drive-by, also fix the condition of the
internal assertion that should occur if there are transferables
passed to multiple destinations.
  • Loading branch information
@addaleax
addaleax committed Dec 13, 2020
commit 30416d6ce5494a44fa9c81a11ff3e2af3ffac7d0
5 changes: 2 additions & 3 deletions src/node_messaging.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,8 +157,7 @@ MaybeLocal<Value> Message::Deserialize(Environment* env,
// Attach all transferred SharedArrayBuffers to their new Isolate.
for (uint32_t i = 0; i < shared_array_buffers_.size(); ++i) {
Local<SharedArrayBuffer> sab =
SharedArrayBuffer::New(env->isolate(),
std::move(shared_array_buffers_[i]));
SharedArrayBuffer::New(env->isolate(), shared_array_buffers_[i]);
shared_array_buffers.push_back(sab);
}

Expand Down Expand Up @@ -1309,7 +1308,7 @@ Maybe<bool> SiblingGroup::Dispatch(

// Transferables cannot be used when there is more
// than a single destination.
if (size() > 2 && message->transferables().size()) {
if (size() > 2 && message->has_transferables()) {
if (error != nullptr)
*error = "Transferables cannot be used with multiple destinations.";
return Nothing<bool>();
Expand Down
3 changes: 3 additions & 0 deletions src/node_messaging.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,9 @@ class Message : public MemoryRetainer {
const std::vector<std::unique_ptr<TransferData>>& transferables() const {
return transferables_;
}
bool has_transferables() const {
return !transferables_.empty() || !array_buffers_.empty();
}

void MemoryInfo(MemoryTracker* tracker) const override;

Expand Down
19 changes: 13 additions & 6 deletions test/parallel/test-worker-broadcastchannel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,12 +111,19 @@ assert.throws(() => new BroadcastChannel(), {
{
const bc1 = new BroadcastChannel('channel3');
const bc2 = new BroadcastChannel('channel3');
bc2.postMessage(new SharedArrayBuffer(10));
bc1.addEventListener('message', common.mustCall(({ data }) => {
assert(data instanceof SharedArrayBuffer);
bc1.close();
bc2.close();
}));
const bc3 = new BroadcastChannel('channel3');
bc3.postMessage(new SharedArrayBuffer(10));
let received = 0;
for (const bc of [bc1, bc2]) {
bc.addEventListener('message', common.mustCall(({ data }) => {
assert(data instanceof SharedArrayBuffer);
if (++received === 2) {
bc1.close();
bc2.close();
bc3.close();
}
}));
}
}

{
Expand Down