Skip to content

src: use available ReqWrap instance for libuv req #21980

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
maclover7 wants to merge 2 commits into from
Closed

src: use available ReqWrap instance for libuv req #21980

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e14131e
src: use available ReqWrap instance for libuv req
maclover7 Jul 26, 2018
1a6c19c
[squash] fix linter
maclover7 Jul 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
src: use available ReqWrap instance for libuv req 
Use available `ReqWrap` descendant to make call to libuv -- avoid doing
call with the `ReqWrap`'s request member and then calling `Dispatched()`
afterwards.
  • Loading branch information
@maclover7
maclover7 committed Jul 26, 2018
commit e14131e2853637f6833e7c7914981f13d4ad2fb4
4 changes: 1 addition & 3 deletions src/node_file.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1552,9 +1552,7 @@ static void WriteString(const FunctionCallbackInfo<Value>& args) {
len = StringBytes::Write(env->isolate(), *stack_buffer, len, args[1], enc);
stack_buffer.SetLengthAndZeroTerminate(len);
uv_buf_t uvbuf = uv_buf_init(*stack_buffer, len);
int err = uv_fs_write(env->event_loop(), req_wrap_async->req(),
fd, &uvbuf, 1, pos, AfterInteger);
req_wrap_async->Dispatched();
int err = req_wrap_async->Dispatch(uv_fs_write, fd, &uvbuf, 1, pos, AfterInteger);
if (err < 0) {
uv_fs_t* uv_req = req_wrap_async->req();
uv_req->result = err;
Expand Down
11 changes: 3 additions & 8 deletions src/stream_wrap.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,10 +276,7 @@ WriteWrap* LibuvStreamWrap::CreateWriteWrap(Local<Object> object) {

int LibuvStreamWrap::DoShutdown(ShutdownWrap* req_wrap_) {
LibuvShutdownWrap* req_wrap = static_cast<LibuvShutdownWrap*>(req_wrap_);
int err;
err = uv_shutdown(req_wrap->req(), stream(), AfterUvShutdown);
req_wrap->Dispatched();
return err;
return req_wrap->Dispatch(uv_shutdown, stream(), AfterUvShutdown);
}


Expand Down Expand Up @@ -340,9 +337,9 @@ int LibuvStreamWrap::DoWrite(WriteWrap* req_wrap,
LibuvWriteWrap* w = static_cast<LibuvWriteWrap*>(req_wrap);
int r;
if (send_handle == nullptr) {
r = uv_write(w->req(), stream(), bufs, count, AfterUvWrite);
r = w->Dispatch(uv_write, stream(), bufs, count, AfterUvWrite);
} else {
r = uv_write2(w->req(), stream(), bufs, count, send_handle, AfterUvWrite);
r = w->Dispatch(uv_write2, stream(), bufs, count, send_handle, AfterUvWrite);
}

if (!r) {
Expand All @@ -356,8 +353,6 @@ int LibuvStreamWrap::DoWrite(WriteWrap* req_wrap,
}
}

w->Dispatched();

return r;
}

Expand Down