diff options
author | Anna Henningsen <anna@addaleax.net> | 2017-12-16 20:39:27 +0100 |
---|---|---|
committer | Anna Henningsen <anna@addaleax.net> | 2017-12-21 20:56:13 +0100 |
commit | 901e9a1983e30cd3913378b80be85f703be5fbc6 (patch) | |
tree | 7e2a65447f478a9fb1ab52a173298bcb3a79d02d | |
parent | 1af82f3d0e13a175c424017565189fffb2f49e83 (diff) | |
download | android-node-v8-901e9a1983e30cd3913378b80be85f703be5fbc6.tar.gz android-node-v8-901e9a1983e30cd3913378b80be85f703be5fbc6.tar.bz2 android-node-v8-901e9a1983e30cd3913378b80be85f703be5fbc6.zip |
src: remove redundant `JSStream::DoAfterWrite`
`Finish<WriteWrap>` already does the same thing and is
called immediately afterwards anyway.
PR-URL: https://github.com/nodejs/node/pull/17713
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Anatoli Papirovski <apapirovski@mac.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
-rw-r--r-- | lib/internal/wrap_js_stream.js | 2 | ||||
-rw-r--r-- | src/js_stream.cc | 12 | ||||
-rw-r--r-- | src/js_stream.h | 1 |
3 files changed, 0 insertions, 15 deletions
diff --git a/lib/internal/wrap_js_stream.js b/lib/internal/wrap_js_stream.js index 73196fd0a2..611095655b 100644 --- a/lib/internal/wrap_js_stream.js +++ b/lib/internal/wrap_js_stream.js @@ -136,7 +136,6 @@ class JSStreamWrap extends Socket { if (!self._dequeue(item)) return; - handle.doAfterWrite(req); handle.finishWrite(req, errCode); }); } @@ -196,7 +195,6 @@ class JSStreamWrap extends Socket { const errCode = uv.UV_ECANCELED; if (item.type === 'write') { - handle.doAfterWrite(req); handle.finishWrite(req, errCode); } else if (item.type === 'shutdown') { handle.finishShutdown(req, errCode); diff --git a/src/js_stream.cc b/src/js_stream.cc index 739d59df13..c4e32feeba 100644 --- a/src/js_stream.cc +++ b/src/js_stream.cc @@ -169,17 +169,6 @@ void JSStream::New(const FunctionCallbackInfo<Value>& args) { } -void JSStream::DoAfterWrite(const FunctionCallbackInfo<Value>& args) { - JSStream* wrap; - CHECK(args[0]->IsObject()); - WriteWrap* w; - ASSIGN_OR_RETURN_UNWRAP(&wrap, args.Holder()); - ASSIGN_OR_RETURN_UNWRAP(&w, args[0].As<Object>()); - - w->Done(0); -} - - template <class Wrap> void JSStream::Finish(const FunctionCallbackInfo<Value>& args) { Wrap* w; @@ -234,7 +223,6 @@ void JSStream::Initialize(Local<Object> target, AsyncWrap::AddWrapMethods(env, t); - env->SetProtoMethod(t, "doAfterWrite", DoAfterWrite); env->SetProtoMethod(t, "finishWrite", Finish<WriteWrap>); env->SetProtoMethod(t, "finishShutdown", Finish<ShutdownWrap>); env->SetProtoMethod(t, "readBuffer", ReadBuffer); diff --git a/src/js_stream.h b/src/js_stream.h index c7caf79374..338cbe5456 100644 --- a/src/js_stream.h +++ b/src/js_stream.h @@ -37,7 +37,6 @@ class JSStream : public AsyncWrap, public StreamBase { AsyncWrap* GetAsyncWrap() override; static void New(const v8::FunctionCallbackInfo<v8::Value>& args); - static void DoAfterWrite(const v8::FunctionCallbackInfo<v8::Value>& args); static void ReadBuffer(const v8::FunctionCallbackInfo<v8::Value>& args); static void EmitEOF(const v8::FunctionCallbackInfo<v8::Value>& args); |