Skip to content

Commit f31a5ec

Browse files
Fishrock123evanlucas
Fishrock123
authored and
evanlucas
committed
handle_wrap: IsRefed() -> HasRef()
Rename slightly to HasRef() at bnoordhuis’ request. Better reflects what we actually do for this check. Refs: #6395 Refs: #6204 Refs: #6401 Refs: #6382 Refs: #6381 PR-URL: #6546 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Trevor Norris <trev.norris@gmail.com>
1 parent cc2af79 commit f31a5ec

11 files changed

+48
-48
lines changed

‎src/handle_wrap.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ void HandleWrap::Unref(const FunctionCallbackInfo<Value>& args) {
3434
}
3535

3636

37-
void HandleWrap::IsRefed(const FunctionCallbackInfo<Value>& args) {
37+
void HandleWrap::HasRef(const FunctionCallbackInfo<Value>& args) {
3838
HandleWrap* wrap = Unwrap<HandleWrap>(args.Holder());
3939
args.GetReturnValue().Set(HasRef(wrap));
4040
}

‎src/handle_wrap.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class HandleWrap : public AsyncWrap {
3535
static void Close(const v8::FunctionCallbackInfo<v8::Value>& args);
3636
static void Ref(const v8::FunctionCallbackInfo<v8::Value>& args);
3737
static void Unref(const v8::FunctionCallbackInfo<v8::Value>& args);
38-
static void IsRefed(const v8::FunctionCallbackInfo<v8::Value>& args);
38+
static void HasRef(const v8::FunctionCallbackInfo<v8::Value>& args);
3939

4040
static inline bool IsAlive(const HandleWrap* wrap) {
4141
return wrap != nullptr && wrap->state_ != kClosed;

‎src/pipe_wrap.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ void PipeWrap::Initialize(Local<Object> target,
8080
env->SetProtoMethod(t, "close", HandleWrap::Close);
8181
env->SetProtoMethod(t, "unref", HandleWrap::Unref);
8282
env->SetProtoMethod(t, "ref", HandleWrap::Ref);
83-
env->SetProtoMethod(t, "isRefed", HandleWrap::IsRefed);
83+
env->SetProtoMethod(t, "hasRef", HandleWrap::HasRef);
8484

8585
StreamWrap::AddMethods(env, t);
8686

‎src/process_wrap.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class ProcessWrap : public HandleWrap {
4040

4141
env->SetProtoMethod(constructor, "ref", HandleWrap::Ref);
4242
env->SetProtoMethod(constructor, "unref", HandleWrap::Unref);
43-
env->SetProtoMethod(constructor, "isRefed", HandleWrap::IsRefed);
43+
env->SetProtoMethod(constructor, "hasRef", HandleWrap::HasRef);
4444

4545
target->Set(FIXED_ONE_BYTE_STRING(env->isolate(), "Process"),
4646
constructor->GetFunction());

‎src/signal_wrap.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class SignalWrap : public HandleWrap {
3232
env->SetProtoMethod(constructor, "close", HandleWrap::Close);
3333
env->SetProtoMethod(constructor, "ref", HandleWrap::Ref);
3434
env->SetProtoMethod(constructor, "unref", HandleWrap::Unref);
35-
env->SetProtoMethod(constructor, "isRefed", HandleWrap::IsRefed);
35+
env->SetProtoMethod(constructor, "hasRef", HandleWrap::HasRef);
3636
env->SetProtoMethod(constructor, "start", Start);
3737
env->SetProtoMethod(constructor, "stop", Stop);
3838

‎src/tcp_wrap.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ void TCPWrap::Initialize(Local<Object> target,
8787

8888
env->SetProtoMethod(t, "ref", HandleWrap::Ref);
8989
env->SetProtoMethod(t, "unref", HandleWrap::Unref);
90-
env->SetProtoMethod(t, "isRefed", HandleWrap::IsRefed);
90+
env->SetProtoMethod(t, "hasRef", HandleWrap::HasRef);
9191

9292
StreamWrap::AddMethods(env, t, StreamBase::kFlagHasWritev);
9393

‎src/timer_wrap.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class TimerWrap : public HandleWrap {
3939
env->SetProtoMethod(constructor, "close", HandleWrap::Close);
4040
env->SetProtoMethod(constructor, "ref", HandleWrap::Ref);
4141
env->SetProtoMethod(constructor, "unref", HandleWrap::Unref);
42-
env->SetProtoMethod(constructor, "isRefed", HandleWrap::IsRefed);
42+
env->SetProtoMethod(constructor, "hasRef", HandleWrap::HasRef);
4343

4444
env->SetProtoMethod(constructor, "start", Start);
4545
env->SetProtoMethod(constructor, "stop", Stop);

‎src/tty_wrap.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ void TTYWrap::Initialize(Local<Object> target,
3636

3737
env->SetProtoMethod(t, "close", HandleWrap::Close);
3838
env->SetProtoMethod(t, "unref", HandleWrap::Unref);
39-
env->SetProtoMethod(t, "isRefed", HandleWrap::IsRefed);
39+
env->SetProtoMethod(t, "hasRef", HandleWrap::HasRef);
4040

4141
StreamWrap::AddMethods(env, t, StreamBase::kFlagNoShutdown);
4242

‎src/udp_wrap.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ void UDPWrap::Initialize(Local<Object> target,
108108

109109
env->SetProtoMethod(t, "ref", HandleWrap::Ref);
110110
env->SetProtoMethod(t, "unref", HandleWrap::Unref);
111-
env->SetProtoMethod(t, "isRefed", HandleWrap::IsRefed);
111+
env->SetProtoMethod(t, "hasRef", HandleWrap::HasRef);
112112

113113
target->Set(FIXED_ONE_BYTE_STRING(env->isolate(), "UDP"), t->GetFunction());
114114
env->set_udp_constructor_function(t->GetFunction());

‎test/parallel/test-handle-wrap-isrefed-tty.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,18 @@ function makeAssert(message) {
99
strictEqual(actual, expected, message);
1010
};
1111
}
12-
const assert = makeAssert('isRefed() not working on tty_wrap');
12+
const assert = makeAssert('hasRef() not working on tty_wrap');
1313

1414
if (process.argv[2] === 'child') {
1515
// Test tty_wrap in piped child to guarentee stdin being a TTY.
1616
const ReadStream = require('tty').ReadStream;
1717
const tty = new ReadStream(0);
18-
assert(Object.getPrototypeOf(tty._handle).hasOwnProperty('isRefed'), true);
19-
assert(tty._handle.isRefed(), true);
18+
assert(Object.getPrototypeOf(tty._handle).hasOwnProperty('hasRef'), true);
19+
assert(tty._handle.hasRef(), true);
2020
tty.unref();
21-
assert(tty._handle.isRefed(), false);
21+
assert(tty._handle.hasRef(), false);
2222
tty._handle.close(
23-
common.mustCall(() => assert(tty._handle.isRefed(), false)));
23+
common.mustCall(() => assert(tty._handle.hasRef(), false)));
2424
return;
2525
}
2626

‎test/parallel/test-handle-wrap-isrefed.js

+34-34
Original file line numberDiff line numberDiff line change
@@ -12,90 +12,90 @@ function makeAssert(message) {
1212

1313
// child_process
1414
{
15-
const assert = makeAssert('isRefed() not working on process_wrap');
15+
const assert = makeAssert('hasRef() not working on process_wrap');
1616
const spawn = require('child_process').spawn;
1717
const cmd = common.isWindows ? 'rundll32' : 'ls';
1818
const cp = spawn(cmd);
19-
assert(Object.getPrototypeOf(cp._handle).hasOwnProperty('isRefed'), true);
20-
assert(cp._handle.isRefed(), true);
19+
assert(Object.getPrototypeOf(cp._handle).hasOwnProperty('hasRef'), true);
20+
assert(cp._handle.hasRef(), true);
2121
cp.unref();
22-
assert(cp._handle.isRefed(), false);
22+
assert(cp._handle.hasRef(), false);
2323
cp.ref();
24-
assert(cp._handle.isRefed(), true);
25-
cp._handle.close(common.mustCall(() => assert(cp._handle.isRefed(), false)));
24+
assert(cp._handle.hasRef(), true);
25+
cp._handle.close(common.mustCall(() => assert(cp._handle.hasRef(), false)));
2626
}
2727

2828

2929
// dgram
3030
{
31-
const assert = makeAssert('isRefed() not working on udp_wrap');
31+
const assert = makeAssert('hasRef() not working on udp_wrap');
3232
const dgram = require('dgram');
3333

3434
const sock4 = dgram.createSocket('udp4');
35-
assert(Object.getPrototypeOf(sock4._handle).hasOwnProperty('isRefed'), true);
36-
assert(sock4._handle.isRefed(), true);
35+
assert(Object.getPrototypeOf(sock4._handle).hasOwnProperty('hasRef'), true);
36+
assert(sock4._handle.hasRef(), true);
3737
sock4.unref();
38-
assert(sock4._handle.isRefed(), false);
38+
assert(sock4._handle.hasRef(), false);
3939
sock4.ref();
40-
assert(sock4._handle.isRefed(), true);
40+
assert(sock4._handle.hasRef(), true);
4141
sock4._handle.close(
42-
common.mustCall(() => assert(sock4._handle.isRefed(), false)));
42+
common.mustCall(() => assert(sock4._handle.hasRef(), false)));
4343

4444
const sock6 = dgram.createSocket('udp6');
45-
assert(Object.getPrototypeOf(sock6._handle).hasOwnProperty('isRefed'), true);
46-
assert(sock6._handle.isRefed(), true);
45+
assert(Object.getPrototypeOf(sock6._handle).hasOwnProperty('hasRef'), true);
46+
assert(sock6._handle.hasRef(), true);
4747
sock6.unref();
48-
assert(sock6._handle.isRefed(), false);
48+
assert(sock6._handle.hasRef(), false);
4949
sock6.ref();
50-
assert(sock6._handle.isRefed(), true);
50+
assert(sock6._handle.hasRef(), true);
5151
sock6._handle.close(
52-
common.mustCall(() => assert(sock6._handle.isRefed(), false)));
52+
common.mustCall(() => assert(sock6._handle.hasRef(), false)));
5353
}
5454

5555

5656
// pipe
5757
{
58-
const assert = makeAssert('isRefed() not working on pipe_wrap');
58+
const assert = makeAssert('hasRef() not working on pipe_wrap');
5959
const Pipe = process.binding('pipe_wrap').Pipe;
6060
const handle = new Pipe();
61-
assert(Object.getPrototypeOf(handle).hasOwnProperty('isRefed'), true);
62-
assert(handle.isRefed(), true);
61+
assert(Object.getPrototypeOf(handle).hasOwnProperty('hasRef'), true);
62+
assert(handle.hasRef(), true);
6363
handle.unref();
64-
assert(handle.isRefed(), false);
64+
assert(handle.hasRef(), false);
6565
handle.ref();
66-
assert(handle.isRefed(), true);
67-
handle.close(common.mustCall(() => assert(handle.isRefed(), false)));
66+
assert(handle.hasRef(), true);
67+
handle.close(common.mustCall(() => assert(handle.hasRef(), false)));
6868
}
6969

7070

7171
// tcp
7272
{
73-
const assert = makeAssert('isRefed() not working on tcp_wrap');
73+
const assert = makeAssert('hasRef() not working on tcp_wrap');
7474
const net = require('net');
7575
const server = net.createServer(() => {}).listen(common.PORT);
76-
assert(Object.getPrototypeOf(server._handle).hasOwnProperty('isRefed'), true);
77-
assert(server._handle.isRefed(), true);
76+
assert(Object.getPrototypeOf(server._handle).hasOwnProperty('hasRef'), true);
77+
assert(server._handle.hasRef(), true);
7878
assert(server._unref, false);
7979
server.unref();
80-
assert(server._handle.isRefed(), false);
80+
assert(server._handle.hasRef(), false);
8181
assert(server._unref, true);
8282
server.ref();
83-
assert(server._handle.isRefed(), true);
83+
assert(server._handle.hasRef(), true);
8484
assert(server._unref, false);
8585
server._handle.close(
86-
common.mustCall(() => assert(server._handle.isRefed(), false)));
86+
common.mustCall(() => assert(server._handle.hasRef(), false)));
8787
}
8888

8989

9090
// timers
9191
{
92-
const assert = makeAssert('isRefed() not working on timer_wrap');
92+
const assert = makeAssert('hasRef() not working on timer_wrap');
9393
const timer = setTimeout(() => {}, 500);
9494
timer.unref();
95-
assert(Object.getPrototypeOf(timer._handle).hasOwnProperty('isRefed'), true);
96-
assert(timer._handle.isRefed(), false);
95+
assert(Object.getPrototypeOf(timer._handle).hasOwnProperty('hasRef'), true);
96+
assert(timer._handle.hasRef(), false);
9797
timer.ref();
98-
assert(timer._handle.isRefed(), true);
98+
assert(timer._handle.hasRef(), true);
9999
timer._handle.close(
100-
common.mustCall(() => assert(timer._handle.isRefed(), false)));
100+
common.mustCall(() => assert(timer._handle.hasRef(), false)));
101101
}

0 commit comments

Comments
 (0)