Skip to content

Commit 2aa75a1

Browse files
addaleaxMylesBorins
authored andcommitted
src: remove redundant JSStream::DoAfterWrite
`Finish<WriteWrap>` already does the same thing and is called immediately afterwards anyway. PR-URL: #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>
1 parent 1d935a0 commit 2aa75a1

File tree

3 files changed

+0
-15
lines changed

3 files changed

+0
-15
lines changed

lib/internal/wrap_js_stream.js

-2
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,6 @@ class JSStreamWrap extends Socket {
136136
if (!self._dequeue(item))
137137
return;
138138

139-
handle.doAfterWrite(req);
140139
handle.finishWrite(req, errCode);
141140
});
142141
}
@@ -196,7 +195,6 @@ class JSStreamWrap extends Socket {
196195

197196
const errCode = uv.UV_ECANCELED;
198197
if (item.type === 'write') {
199-
handle.doAfterWrite(req);
200198
handle.finishWrite(req, errCode);
201199
} else if (item.type === 'shutdown') {
202200
handle.finishShutdown(req, errCode);

src/js_stream.cc

-12
Original file line numberDiff line numberDiff line change
@@ -169,17 +169,6 @@ void JSStream::New(const FunctionCallbackInfo<Value>& args) {
169169
}
170170

171171

172-
void JSStream::DoAfterWrite(const FunctionCallbackInfo<Value>& args) {
173-
JSStream* wrap;
174-
CHECK(args[0]->IsObject());
175-
WriteWrap* w;
176-
ASSIGN_OR_RETURN_UNWRAP(&wrap, args.Holder());
177-
ASSIGN_OR_RETURN_UNWRAP(&w, args[0].As<Object>());
178-
179-
w->Done(0);
180-
}
181-
182-
183172
template <class Wrap>
184173
void JSStream::Finish(const FunctionCallbackInfo<Value>& args) {
185174
Wrap* w;
@@ -234,7 +223,6 @@ void JSStream::Initialize(Local<Object> target,
234223

235224
AsyncWrap::AddWrapMethods(env, t);
236225

237-
env->SetProtoMethod(t, "doAfterWrite", DoAfterWrite);
238226
env->SetProtoMethod(t, "finishWrite", Finish<WriteWrap>);
239227
env->SetProtoMethod(t, "finishShutdown", Finish<ShutdownWrap>);
240228
env->SetProtoMethod(t, "readBuffer", ReadBuffer);

src/js_stream.h

-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ class JSStream : public AsyncWrap, public StreamBase {
3737
AsyncWrap* GetAsyncWrap() override;
3838

3939
static void New(const v8::FunctionCallbackInfo<v8::Value>& args);
40-
static void DoAfterWrite(const v8::FunctionCallbackInfo<v8::Value>& args);
4140
static void ReadBuffer(const v8::FunctionCallbackInfo<v8::Value>& args);
4241
static void EmitEOF(const v8::FunctionCallbackInfo<v8::Value>& args);
4342

0 commit comments

Comments
 (0)