Skip to content

Commit abbe313

Browse files
committed
worker: add hasRef() to the handle object
This should help projects like https://github.com/mafintosh/why-is-node-running and https://github.com/facebook/jest to detect if Worker instances are keeping the event loop active correctly. Fixes: nodejs#42091 Refs: mafintosh/why-is-node-running#59 Signed-off-by: Darshan Sen <raisinten@gmail.com>
1 parent 24adba6 commit abbe313

File tree

3 files changed

+42
-0
lines changed

3 files changed

+42
-0
lines changed

src/node_worker.cc

+8
Original file line numberDiff line numberDiff line change
@@ -665,6 +665,12 @@ void Worker::Ref(const FunctionCallbackInfo<Value>& args) {
665665
}
666666
}
667667

668+
void Worker::HasRef(const FunctionCallbackInfo<Value>& args) {
669+
Worker* w;
670+
ASSIGN_OR_RETURN_UNWRAP(&w, args.This());
671+
args.GetReturnValue().Set(w->has_ref_);
672+
}
673+
668674
void Worker::Unref(const FunctionCallbackInfo<Value>& args) {
669675
Worker* w;
670676
ASSIGN_OR_RETURN_UNWRAP(&w, args.This());
@@ -827,6 +833,7 @@ void InitWorker(Local<Object> target,
827833

828834
env->SetProtoMethod(w, "startThread", Worker::StartThread);
829835
env->SetProtoMethod(w, "stopThread", Worker::StopThread);
836+
env->SetProtoMethod(w, "hasRef", Worker::HasRef);
830837
env->SetProtoMethod(w, "ref", Worker::Ref);
831838
env->SetProtoMethod(w, "unref", Worker::Unref);
832839
env->SetProtoMethod(w, "getResourceLimits", Worker::GetResourceLimits);
@@ -890,6 +897,7 @@ void RegisterExternalReferences(ExternalReferenceRegistry* registry) {
890897
registry->Register(Worker::New);
891898
registry->Register(Worker::StartThread);
892899
registry->Register(Worker::StopThread);
900+
registry->Register(Worker::HasRef);
893901
registry->Register(Worker::Ref);
894902
registry->Register(Worker::Unref);
895903
registry->Register(Worker::GetResourceLimits);

src/node_worker.h

+1
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ class Worker : public AsyncWrap {
6161
static void SetEnvVars(const v8::FunctionCallbackInfo<v8::Value>& args);
6262
static void StartThread(const v8::FunctionCallbackInfo<v8::Value>& args);
6363
static void StopThread(const v8::FunctionCallbackInfo<v8::Value>& args);
64+
static void HasRef(const v8::FunctionCallbackInfo<v8::Value>& args);
6465
static void Ref(const v8::FunctionCallbackInfo<v8::Value>& args);
6566
static void Unref(const v8::FunctionCallbackInfo<v8::Value>& args);
6667
static void GetResourceLimits(

test/parallel/test-worker-hasref.js

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
'use strict';
2+
const common = require('../common');
3+
4+
const { Worker } = require('worker_threads');
5+
const { createHook } = require('async_hooks');
6+
const { strictEqual } = require('assert');
7+
8+
let handle;
9+
10+
createHook({
11+
init(asyncId, type, triggerAsyncId, resource) {
12+
if (type === 'WORKER') {
13+
handle = resource;
14+
this.disable();
15+
}
16+
}
17+
}).enable();
18+
19+
const w = new Worker('', { eval: true });
20+
21+
strictEqual(handle.hasRef(), true);
22+
w.unref();
23+
strictEqual(handle.hasRef(), false);
24+
w.ref();
25+
strictEqual(handle.hasRef(), true);
26+
27+
w.on('exit', common.mustCall((exitCode) => {
28+
strictEqual(exitCode, 0);
29+
strictEqual(handle.hasRef(), true);
30+
setTimeout(common.mustCall(() => {
31+
strictEqual(handle.hasRef(), undefined);
32+
}), 0);
33+
}));

0 commit comments

Comments
 (0)