worker: make terminate() resolve for unref’ed Workers · nodejs/node@fa77dc5 · GitHub

nodejs / node Public

• Notifications You must be signed in to change notification settings
• Fork 36.6k
• Star 120k

• Code
• Issues 637
• Pull requests 746
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit fa77dc5

Browse filesBrowse the repository at this point in the historyBrowse files

addaleax

authored and

BridgeAR

committed

worker: make terminate() resolve for unref’ed Workers

Once `worker.terminate()` is called, the Worker instance will be destroyed as soon as possible anyway, so in order to make the Promise returned by `worker.terminate()` resolve always, it should be okay to just call `.ref()` on it and keep the main event loop alive temporarily. PR-URL: #29484 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>

1 parent 79a277e commit fa77dc5
Copy full SHA for fa77dc5

2 files changed

+18Lines changed: 18 additions & 0 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• lib/internal
  • worker.js
• test/parallel
  • test-worker-terminate-unrefed.js

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎lib/internal/worker.js‎

Copy file name to clipboardExpand all lines: lib/internal/worker.js

+2Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -226,6 +226,8 @@ class Worker extends EventEmitter {
226	226	terminate(callback) {
227	227	debug(`[${threadId}] terminates Worker with ID ${this.threadId}`);
228	228
	229	+ this.ref();
	230	+
229	231	if (typeof callback === 'function') {
230	232	process.emitWarning(
231	233	'Passing a callback to worker.terminate() is deprecated. ' +

Collapse file

‎test/parallel/test-worker-terminate-unrefed.js‎

Copy file name to clipboard

+16Lines changed: 16 additions & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -0,0 +1,16 @@
	1	+ 'use strict';
	2	+ const common = require('../common');
	3	+ const { once } = require('events');
	4	+ const { Worker } = require('worker_threads');
	5	+
	6	+ // Test that calling worker.terminate() on an unref()’ed Worker instance
	7	+ // still resolves the returned Promise.
	8	+
	9	+ async function test() {
	10	+ const worker = new Worker('setTimeout(() => {}, 1000000);', { eval: true });
	11	+ await once(worker, 'online');
	12	+ worker.unref();
	13	+ await worker.terminate();
	14	+ }
	15	+
	16	+ test().then(common.mustCall());

0 commit comments

Comments

0 (0)