From 6ea74845e5d3f3758a6c73223df2bc3cbbdec6b1 Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Thu, 14 May 2020 09:12:27 +0200 Subject: [PATCH 1/2] worker: fix crash when .unref() is called during exit To be more precise, fix a crash when `worker.unref()` is called from a message on the Worker that is not emitted before the Worker thread has stopped. --- src/node_worker.cc | 4 ++-- .../test-worker-unref-from-message-during-exit.js | 13 +++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 test/parallel/test-worker-unref-from-message-during-exit.js diff --git a/src/node_worker.cc b/src/node_worker.cc index 1e1d9434cddb4c..beb7f5e5d5a6ab 100644 --- a/src/node_worker.cc +++ b/src/node_worker.cc @@ -660,7 +660,7 @@ void Worker::StopThread(const FunctionCallbackInfo& args) { void Worker::Ref(const FunctionCallbackInfo& args) { Worker* w; ASSIGN_OR_RETURN_UNWRAP(&w, args.This()); - if (!w->has_ref_) { + if (!w->has_ref_ && !w->thread_joined_) { w->has_ref_ = true; w->env()->add_refs(1); } @@ -669,7 +669,7 @@ void Worker::Ref(const FunctionCallbackInfo& args) { void Worker::Unref(const FunctionCallbackInfo& args) { Worker* w; ASSIGN_OR_RETURN_UNWRAP(&w, args.This()); - if (w->has_ref_) { + if (w->has_ref_ && !w->thread_joined_) { w->has_ref_ = false; w->env()->add_refs(-1); } diff --git a/test/parallel/test-worker-unref-from-message-during-exit.js b/test/parallel/test-worker-unref-from-message-during-exit.js new file mode 100644 index 00000000000000..7943e75feae317 --- /dev/null +++ b/test/parallel/test-worker-unref-from-message-during-exit.js @@ -0,0 +1,13 @@ +'use strict'; +const common = require('../common'); +const { Worker } = require('worker_threads'); + +const w = new Worker(` +require('worker_threads').parentPort.postMessage({}); +`, { eval: true }); +w.on('message', common.mustCall(() => { + w.unref(); +})); + +// Wait a bit so that the 'message' event is emitted while the Worker exits. +Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, 100); From e010141eb7a1f86f898f355e8986edcbd2ca319e Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Thu, 14 May 2020 19:11:38 +0200 Subject: [PATCH 2/2] fixup! worker: fix crash when .unref() is called during exit --- test/parallel/test-worker-unref-from-message-during-exit.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/parallel/test-worker-unref-from-message-during-exit.js b/test/parallel/test-worker-unref-from-message-during-exit.js index 7943e75feae317..3e696f369e4179 100644 --- a/test/parallel/test-worker-unref-from-message-during-exit.js +++ b/test/parallel/test-worker-unref-from-message-during-exit.js @@ -2,6 +2,9 @@ const common = require('../common'); const { Worker } = require('worker_threads'); +// This used to crash because the `.unref()` was unexpected while the Worker +// was exiting. + const w = new Worker(` require('worker_threads').parentPort.postMessage({}); `, { eval: true });