Skip to content
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

Jump to bottom

Use write_nonblock in fast_write #2597

Closed
wants to merge 2 commits into from
Closed

Use write_nonblock in fast_write #2597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9db09ca
replace io.syswrite with io.write_nonblock
calvinxiao Apr 11, 2021
3508286
rescue EINTR in write_nonblock
calvinxiao Apr 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/puma/request.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,8 +198,8 @@ def fast_write(io, str)
n = 0
while true
begin
n = io.syswrite str
rescue Errno::EAGAIN, Errno::EWOULDBLOCK
n = io.write_nonblock str
rescue IO::WaitWritable, Errno::EINTR
if !IO.select(nil, [io], nil, WRITE_TIMEOUT)
raise ConnectionError, "Socket timeout writing data"
end
Expand Down
4 changes: 2 additions & 2 deletions test/helpers/integration.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,8 @@ def fast_write(io, str)
n = 0
while true
begin
n = io.syswrite str
rescue Errno::EAGAIN, Errno::EWOULDBLOCK => e
n = io.write_nonblock str
rescue IO::WaitWritable, Errno::EINTR => e
if !IO.select(nil, [io], nil, 5)
raise e
end
Expand Down