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

Reduce memory allocation when writing to SSLSocket #212

Merged
merged 2 commits into from
Aug 8, 2018
Merged

Reduce memory allocation when writing to SSLSocket #212

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3f6e30e
openssl/buffering.rb: no RS when output
nobu Jan 25, 2018
251b5be
Reduce memory allocation when writing to SSLSocket
janko Aug 4, 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
17 changes: 5 additions & 12 deletions lib/openssl/buffering.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,20 +316,15 @@ def do_write(s)
@wbuffer << s
@wbuffer.force_encoding(Encoding::BINARY)
@sync ||= false
if @sync or @wbuffer.size > BLOCK_SIZE or idx = @wbuffer.rindex($/)
remain = idx ? idx + $/.size : @wbuffer.length
nwritten = 0
while remain > 0
str = @wbuffer[nwritten,remain]
if @sync or @wbuffer.size > BLOCK_SIZE
until @wbuffer.empty?
begin
nwrote = syswrite(str)
nwrote = syswrite(@wbuffer)
rescue Errno::EAGAIN
retry
end
remain -= nwrote
nwritten += nwrote
@wbuffer[0, nwrote] = ""
end
@wbuffer[0,nwritten] = ""
end
end

Expand Down Expand Up @@ -409,9 +404,7 @@ def puts(*args)
end
args.each{|arg|
s << arg.to_s
if $/ && /\n\z/ !~ s
s << "\n"
end
s.sub!(/(?<!\n)\z/, "\n")
}
do_write(s)
nil
Expand Down