diff options
author | Anna Henningsen <anna@addaleax.net> | 2017-09-25 21:16:02 +0200 |
---|---|---|
committer | Anna Henningsen <anna@addaleax.net> | 2018-05-10 14:15:16 +0200 |
commit | cac8496c2ff592198a7afd114610deccb0e178ab (patch) | |
tree | f71985006d0cb1f2348d37c60d5f617db9622439 /src/tcp_wrap.cc | |
parent | 17e289eca8f8398243df5c4006d80f7381fd08bc (diff) | |
download | android-node-v8-cac8496c2ff592198a7afd114610deccb0e178ab.tar.gz android-node-v8-cac8496c2ff592198a7afd114610deccb0e178ab.tar.bz2 android-node-v8-cac8496c2ff592198a7afd114610deccb0e178ab.zip |
src: unify ReqWrap libuv calling
This allows easier tracking of whether there are active `ReqWrap`s.
Many thanks for Stephen Belanger for reviewing the original version of
this commit in the Ayo.js project.
Refs: https://github.com/ayojs/ayo/pull/85
PR-URL: https://github.com/nodejs/node/pull/19377
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: James M Snell <jasnell@gmail.com>
Diffstat (limited to 'src/tcp_wrap.cc')
-rw-r--r-- | src/tcp_wrap.cc | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/tcp_wrap.cc b/src/tcp_wrap.cc index 3ccd157159..70c60fa47c 100644 --- a/src/tcp_wrap.cc +++ b/src/tcp_wrap.cc @@ -287,11 +287,10 @@ void TCPWrap::Connect(const FunctionCallbackInfo<Value>& args) { AsyncHooks::DefaultTriggerAsyncIdScope trigger_scope(wrap); ConnectWrap* req_wrap = new ConnectWrap(env, req_wrap_obj, AsyncWrap::PROVIDER_TCPCONNECTWRAP); - err = uv_tcp_connect(req_wrap->req(), - &wrap->handle_, - reinterpret_cast<const sockaddr*>(&addr), - AfterConnect); - req_wrap->Dispatched(); + err = req_wrap->Dispatch(uv_tcp_connect, + &wrap->handle_, + reinterpret_cast<const sockaddr*>(&addr), + AfterConnect); if (err) delete req_wrap; } @@ -323,11 +322,10 @@ void TCPWrap::Connect6(const FunctionCallbackInfo<Value>& args) { AsyncHooks::DefaultTriggerAsyncIdScope trigger_scope(wrap); ConnectWrap* req_wrap = new ConnectWrap(env, req_wrap_obj, AsyncWrap::PROVIDER_TCPCONNECTWRAP); - err = uv_tcp_connect(req_wrap->req(), - &wrap->handle_, - reinterpret_cast<const sockaddr*>(&addr), - AfterConnect); - req_wrap->Dispatched(); + err = req_wrap->Dispatch(uv_tcp_connect, + &wrap->handle_, + reinterpret_cast<const sockaddr*>(&addr), + AfterConnect); if (err) delete req_wrap; } |