Skip to content

Commit 105efb0

Browse files
committed
process: remove _getActiveHandles and _getActiveRequests
Remove the redundnat `_getActiveHandles` and `_getActiveRequests` since we have a public `getActiveResourcesInfo` method introduced as part of PR #40813. Refactored tests to use `getActiveResourcesInfo` method. Ref: #40813
1 parent b9258e5 commit 105efb0

File tree

5 files changed

+18
-48
lines changed

5 files changed

+18
-48
lines changed

lib/internal/bootstrap/node.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -154,10 +154,6 @@ const rawMethods = internalBinding('process_methods');
154154
process.dlopen = rawMethods.dlopen;
155155
process.uptime = rawMethods.uptime;
156156

157-
// TODO(joyeecheung): either remove them or make them public
158-
process._getActiveRequests = rawMethods._getActiveRequests;
159-
process._getActiveHandles = rawMethods._getActiveHandles;
160-
161157
process.getActiveResourcesInfo = function() {
162158
const timerCounts = internalTimers.getTimerCounts();
163159
return ArrayPrototypeConcat(

src/node_process_methods.cc

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -243,21 +243,6 @@ static void Uptime(const FunctionCallbackInfo<Value>& args) {
243243
args.GetReturnValue().Set(result);
244244
}
245245

246-
static void GetActiveRequests(const FunctionCallbackInfo<Value>& args) {
247-
Environment* env = Environment::GetCurrent(args);
248-
249-
std::vector<Local<Value>> request_v;
250-
for (ReqWrapBase* req_wrap : *env->req_wrap_queue()) {
251-
AsyncWrap* w = req_wrap->GetAsyncWrap();
252-
if (w->persistent().IsEmpty())
253-
continue;
254-
request_v.emplace_back(w->GetOwner());
255-
}
256-
257-
args.GetReturnValue().Set(
258-
Array::New(env->isolate(), request_v.data(), request_v.size()));
259-
}
260-
261246
static void GetActiveRequestsInfo(const FunctionCallbackInfo<Value>& args) {
262247
Environment* env = Environment::GetCurrent(args);
263248

@@ -273,21 +258,6 @@ static void GetActiveRequestsInfo(const FunctionCallbackInfo<Value>& args) {
273258
Array::New(env->isolate(), requests_info.data(), requests_info.size()));
274259
}
275260

276-
// Non-static, friend of HandleWrap. Could have been a HandleWrap method but
277-
// implemented here for consistency with GetActiveRequests().
278-
void GetActiveHandles(const FunctionCallbackInfo<Value>& args) {
279-
Environment* env = Environment::GetCurrent(args);
280-
281-
std::vector<Local<Value>> handle_v;
282-
for (auto w : *env->handle_wrap_queue()) {
283-
if (!HandleWrap::HasRef(w))
284-
continue;
285-
handle_v.emplace_back(w->GetOwner());
286-
}
287-
args.GetReturnValue().Set(
288-
Array::New(env->isolate(), handle_v.data(), handle_v.size()));
289-
}
290-
291261
void GetActiveHandlesInfo(const FunctionCallbackInfo<Value>& args) {
292262
Environment* env = Environment::GetCurrent(args);
293263

@@ -576,9 +546,7 @@ static void Initialize(Local<Object> target,
576546
env->SetMethod(target, "cpuUsage", CPUUsage);
577547
env->SetMethod(target, "resourceUsage", ResourceUsage);
578548

579-
env->SetMethod(target, "_getActiveRequests", GetActiveRequests);
580549
env->SetMethod(target, "_getActiveRequestsInfo", GetActiveRequestsInfo);
581-
env->SetMethod(target, "_getActiveHandles", GetActiveHandles);
582550
env->SetMethod(target, "_getActiveHandlesInfo", GetActiveHandlesInfo);
583551
env->SetMethod(target, "_kill", Kill);
584552

@@ -605,9 +573,7 @@ void RegisterExternalReferences(ExternalReferenceRegistry* registry) {
605573
registry->Register(CPUUsage);
606574
registry->Register(ResourceUsage);
607575

608-
registry->Register(GetActiveRequests);
609576
registry->Register(GetActiveRequestsInfo);
610-
registry->Register(GetActiveHandles);
611577
registry->Register(GetActiveHandlesInfo);
612578
registry->Register(Kill);
613579

test/parallel/test-process-getactivehandles.js

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,23 @@ function clientConnected(client) {
3030

3131

3232
function checkAll() {
33-
const handles = process._getActiveHandles();
33+
const handles = process.getActiveResourcesInfo();
34+
const tcpSocketResources = handles
35+
.filter((resource) => resource === 'TCPSocketWrap').length;
36+
37+
assert.ok(tcpSocketResources === clients_counter + connections.length,
38+
'17 socket resources created');
3439

3540
clients.forEach(function(item) {
36-
assert.ok(handles.includes(item));
3741
item.destroy();
3842
});
3943

4044
connections.forEach(function(item) {
41-
assert.ok(handles.includes(item));
4245
item.end();
4346
});
4447

45-
assert.ok(handles.includes(server));
48+
const tcpServerResources = handles
49+
.filter((resource) => resource === 'TCPServerWrap').length;
50+
assert.ok(tcpServerResources === 1, '1 server resource exists');
4651
server.close();
4752
}

test/parallel/test-process-getactiverequests.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ const fs = require('fs');
77
for (let i = 0; i < 12; i++)
88
fs.open(__filename, 'r', common.mustCall());
99

10-
assert.strictEqual(process._getActiveRequests().length, 12);
10+
assert.strictEqual(process.getActiveResourcesInfo().length, 12);

test/pseudo-tty/ref_keeps_node_running.js

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,28 @@ require('../common');
66
const { internalBinding } = require('internal/test/binding');
77
const { TTY, isTTY } = internalBinding('tty_wrap');
88
const strictEqual = require('assert').strictEqual;
9+
const TTY_RESOURCE_NAME = 'TTYWrap';
910

1011
strictEqual(isTTY(0), true, 'fd 0 is not a TTY');
1112

1213
const handle = new TTY(0);
1314
handle.readStart();
1415
handle.onread = () => {};
1516

16-
function isHandleActive(handle) {
17-
return process._getActiveHandles().some((active) => active === handle);
17+
function isTTYActive(count) {
18+
return process.getActiveResourcesInfo()
19+
.filter((active) => active === TTY_RESOURCE_NAME)
20+
.length === count;
1821
}
1922

20-
strictEqual(isHandleActive(handle), true, 'TTY handle not initially active');
23+
strictEqual(isTTYActive(1), true, 'TTY handle not initially active');
2124

2225
handle.unref();
2326

24-
strictEqual(isHandleActive(handle), false, 'TTY handle active after unref()');
27+
strictEqual(isTTYActive(1), false, 'TTY handle active after unref()');
2528

2629
handle.ref();
2730

28-
strictEqual(isHandleActive(handle), true, 'TTY handle inactive after ref()');
31+
strictEqual(isTTYActive(1), true, 'TTY handle inactive after ref()');
2932

3033
handle.unref();

0 commit comments

Comments
 (0)