diff --git a/src/handle_wrap.cc b/src/handle_wrap.cc index 8421d694a991bb..43c5490eefa888 100644 --- a/src/handle_wrap.cc +++ b/src/handle_wrap.cc @@ -37,14 +37,6 @@ void HandleWrap::Unref(const FunctionCallbackInfo& args) { } -void HandleWrap::Unrefed(const FunctionCallbackInfo& args) { - HandleWrap* wrap = Unwrap(args.Holder()); - - bool unrefed = wrap->flags_ & kUnref == 1; - args.GetReturnValue().Set(unrefed); -} - - void HandleWrap::Close(const FunctionCallbackInfo& args) { Environment* env = Environment::GetCurrent(args); diff --git a/src/handle_wrap.h b/src/handle_wrap.h index d945143d31a952..da712b33befbcc 100644 --- a/src/handle_wrap.h +++ b/src/handle_wrap.h @@ -35,7 +35,6 @@ class HandleWrap : public AsyncWrap { static void Close(const v8::FunctionCallbackInfo& args); static void Ref(const v8::FunctionCallbackInfo& args); static void Unref(const v8::FunctionCallbackInfo& args); - static void Unrefed(const v8::FunctionCallbackInfo& args); static inline bool IsAlive(const HandleWrap* wrap) { return wrap != nullptr && wrap->GetHandle() != nullptr; diff --git a/src/pipe_wrap.cc b/src/pipe_wrap.cc index 43df5cb7158b41..1c60944fe64079 100644 --- a/src/pipe_wrap.cc +++ b/src/pipe_wrap.cc @@ -80,7 +80,6 @@ void PipeWrap::Initialize(Local target, env->SetProtoMethod(t, "close", HandleWrap::Close); env->SetProtoMethod(t, "unref", HandleWrap::Unref); env->SetProtoMethod(t, "ref", HandleWrap::Ref); - env->SetProtoMethod(t, "unrefed", HandleWrap::Unrefed); StreamWrap::AddMethods(env, t); diff --git a/src/process_wrap.cc b/src/process_wrap.cc index b804d9f35e47f1..420c71d7ea4052 100644 --- a/src/process_wrap.cc +++ b/src/process_wrap.cc @@ -40,7 +40,6 @@ class ProcessWrap : public HandleWrap { env->SetProtoMethod(constructor, "ref", HandleWrap::Ref); env->SetProtoMethod(constructor, "unref", HandleWrap::Unref); - env->SetProtoMethod(constructor, "unrefed", HandleWrap::Unrefed); target->Set(FIXED_ONE_BYTE_STRING(env->isolate(), "Process"), constructor->GetFunction()); diff --git a/src/signal_wrap.cc b/src/signal_wrap.cc index a008b083f0ab53..5f6a6a52bcd786 100644 --- a/src/signal_wrap.cc +++ b/src/signal_wrap.cc @@ -32,7 +32,6 @@ class SignalWrap : public HandleWrap { env->SetProtoMethod(constructor, "close", HandleWrap::Close); env->SetProtoMethod(constructor, "ref", HandleWrap::Ref); env->SetProtoMethod(constructor, "unref", HandleWrap::Unref); - env->SetProtoMethod(constructor, "unrefed", HandleWrap::Unrefed); env->SetProtoMethod(constructor, "start", Start); env->SetProtoMethod(constructor, "stop", Stop); diff --git a/src/tcp_wrap.cc b/src/tcp_wrap.cc index d1cc99e756e124..c36e814ec6e37f 100644 --- a/src/tcp_wrap.cc +++ b/src/tcp_wrap.cc @@ -87,7 +87,6 @@ void TCPWrap::Initialize(Local target, env->SetProtoMethod(t, "ref", HandleWrap::Ref); env->SetProtoMethod(t, "unref", HandleWrap::Unref); - env->SetProtoMethod(t, "unrefed", HandleWrap::Unrefed); StreamWrap::AddMethods(env, t, StreamBase::kFlagHasWritev); diff --git a/src/timer_wrap.cc b/src/timer_wrap.cc index b2c41ebf73a51e..79fa86953d47e2 100644 --- a/src/timer_wrap.cc +++ b/src/timer_wrap.cc @@ -39,7 +39,6 @@ class TimerWrap : public HandleWrap { env->SetProtoMethod(constructor, "close", HandleWrap::Close); env->SetProtoMethod(constructor, "ref", HandleWrap::Ref); env->SetProtoMethod(constructor, "unref", HandleWrap::Unref); - env->SetProtoMethod(constructor, "unrefed", HandleWrap::Unrefed); env->SetProtoMethod(constructor, "start", Start); env->SetProtoMethod(constructor, "stop", Stop); diff --git a/src/tty_wrap.cc b/src/tty_wrap.cc index e7acedd27a1745..63e8454bacdec3 100644 --- a/src/tty_wrap.cc +++ b/src/tty_wrap.cc @@ -36,7 +36,6 @@ void TTYWrap::Initialize(Local target, env->SetProtoMethod(t, "close", HandleWrap::Close); env->SetProtoMethod(t, "unref", HandleWrap::Unref); - env->SetProtoMethod(t, "unrefed", HandleWrap::Unrefed); StreamWrap::AddMethods(env, t, StreamBase::kFlagNoShutdown); diff --git a/src/udp_wrap.cc b/src/udp_wrap.cc index b5f3a3cf540f05..dc2804812fdf19 100644 --- a/src/udp_wrap.cc +++ b/src/udp_wrap.cc @@ -108,7 +108,6 @@ void UDPWrap::Initialize(Local target, env->SetProtoMethod(t, "ref", HandleWrap::Ref); env->SetProtoMethod(t, "unref", HandleWrap::Unref); - env->SetProtoMethod(t, "unrefed", HandleWrap::Unrefed); target->Set(FIXED_ONE_BYTE_STRING(env->isolate(), "UDP"), t->GetFunction()); env->set_udp_constructor_function(t->GetFunction()); diff --git a/test/parallel/test-handle-wrap-isrefed-tty.js b/test/parallel/test-handle-wrap-isrefed-tty.js deleted file mode 100644 index 4c31d63b52c568..00000000000000 --- a/test/parallel/test-handle-wrap-isrefed-tty.js +++ /dev/null @@ -1,33 +0,0 @@ -'use strict'; - -const common = require('../common'); -const strictEqual = require('assert').strictEqual; -const spawn = require('child_process').spawn; - -function makeAssert(message) { - return function(actual, expected) { - strictEqual(actual, expected, message); - }; -} -const assert = makeAssert('unrefed() not working on tty_wrap'); - -if (process.argv[2] === 'child') { - // Test tty_wrap in piped child to guarentee stdin being a TTY. - const ReadStream = require('tty').ReadStream; - const tty = new ReadStream(0); - assert(Object.getPrototypeOf(tty._handle).hasOwnProperty('unrefed'), true); - assert(tty._handle.unrefed(), false); - tty.unref(); - assert(tty._handle.unrefed(), true); - tty._handle.close(); - assert(tty._handle.unrefed(), true); - return; -} - -// Use spawn so that we can be sure that stdin has a _handle property. -// Refs: https://github.com/nodejs/node/pull/5916 -const proc = spawn(process.execPath, [__filename, 'child'], { stdio: 'pipe' }); -proc.stderr.pipe(process.stderr); -proc.on('exit', common.mustCall(function(exitCode) { - process.exitCode = exitCode; -})); diff --git a/test/parallel/test-handle-wrap-isrefed.js b/test/parallel/test-handle-wrap-isrefed.js deleted file mode 100644 index c88534117c3c9b..00000000000000 --- a/test/parallel/test-handle-wrap-isrefed.js +++ /dev/null @@ -1,103 +0,0 @@ -'use strict'; - -const common = require('../common'); -const strictEqual = require('assert').strictEqual; - -function makeAssert(message) { - return function(actual, expected) { - strictEqual(actual, expected, message); - }; -} - - -// child_process -{ - const assert = makeAssert('unrefed() not working on process_wrap'); - const spawn = require('child_process').spawn; - const cmd = common.isWindows ? 'rundll32' : 'ls'; - const cp = spawn(cmd); - assert(Object.getPrototypeOf(cp._handle).hasOwnProperty('unrefed'), true); - assert(cp._handle.unrefed(), false); - cp.unref(); - assert(cp._handle.unrefed(), true); - cp.ref(); - assert(cp._handle.unrefed(), false); - cp._handle.close(); - assert(cp._handle.unrefed(), false); -} - - -// dgram -{ - const assert = makeAssert('unrefed() not working on udp_wrap'); - const dgram = require('dgram'); - - const sock4 = dgram.createSocket('udp4'); - assert(Object.getPrototypeOf(sock4._handle).hasOwnProperty('unrefed'), true); - assert(sock4._handle.unrefed(), false); - sock4.unref(); - assert(sock4._handle.unrefed(), true); - sock4.ref(); - assert(sock4._handle.unrefed(), false); - sock4._handle.close(); - assert(sock4._handle.unrefed(), false); - - const sock6 = dgram.createSocket('udp6'); - assert(Object.getPrototypeOf(sock6._handle).hasOwnProperty('unrefed'), true); - assert(sock6._handle.unrefed(), false); - sock6.unref(); - assert(sock6._handle.unrefed(), true); - sock6.ref(); - assert(sock6._handle.unrefed(), false); - sock6._handle.close(); - assert(sock6._handle.unrefed(), false); -} - - -// pipe -{ - const assert = makeAssert('unrefed() not working on pipe_wrap'); - const Pipe = process.binding('pipe_wrap').Pipe; - const handle = new Pipe(); - assert(Object.getPrototypeOf(handle).hasOwnProperty('unrefed'), true); - assert(handle.unrefed(), false); - handle.unref(); - assert(handle.unrefed(), true); - handle.ref(); - assert(handle.unrefed(), false); - handle.close(); - assert(handle.unrefed(), false); -} - - -// tcp -{ - const assert = makeAssert('unrefed() not working on tcp_wrap'); - const net = require('net'); - const server = net.createServer(() => {}).listen(common.PORT); - assert(Object.getPrototypeOf(server._handle).hasOwnProperty('unrefed'), true); - assert(server._handle.unrefed(), false); - assert(server._unref, false); - server.unref(); - assert(server._handle.unrefed(), true); - assert(server._unref, true); - server.ref(); - assert(server._handle.unrefed(), false); - assert(server._unref, false); - server._handle.close(); - assert(server._handle.unrefed(), false); -} - - -// timers -{ - const assert = makeAssert('unrefed() not working on timer_wrap'); - const timer = setTimeout(() => {}, 500); - timer.unref(); - assert(Object.getPrototypeOf(timer._handle).hasOwnProperty('unrefed'), true); - assert(timer._handle.unrefed(), true); - timer.ref(); - assert(timer._handle.unrefed(), false); - timer.close(); - assert(timer._handle.unrefed(), false); -}