* [PATCH 1/2] remove kgio read and wait dependencies
2017-03-06 3:30 [PATCH 0/2] WIP remove-kgio branch pushed branch Eric Wong
@ 2017-03-06 3:30 ` Eric Wong
2017-03-06 3:30 ` [PATCH 2/2] drop writev support Eric Wong
1 sibling, 0 replies; 3+ messages in thread
From: Eric Wong @ 2017-03-06 3:30 UTC (permalink / raw)
To: yahns-public
Ruby 2.4+ should contain everything we need to replace kgio;
and we can provide reasonable (if not slower) facsimiles
for older Rubies.
The reading and wait_*able APIs of kgio are similar to APIs
in the IO core class, so lets deal with that, first.
Removing dependencies on writing will be slightly trickier...
---
| 42 ++++++++++++++++++++++++--------------
| 23 +++++++++++----------
lib/yahns.rb | 1 +
lib/yahns/acceptor.rb | 2 +-
lib/yahns/client_expire_generic.rb | 2 +-
lib/yahns/http_client.rb | 32 ++++++++++-------------------
lib/yahns/http_response.rb | 8 ++++----
lib/yahns/openssl_client.rb | 6 +++---
lib/yahns/proxy_http_response.rb | 6 +++---
lib/yahns/req_res.rb | 4 ++--
lib/yahns/server.rb | 2 +-
lib/yahns/server_mp.rb | 2 +-
lib/yahns/sigevent_efd.rb | 1 -
lib/yahns/sigevent_pipe.rb | 10 +++------
lib/yahns/worker.rb | 6 +++---
15 files changed, 73 insertions(+), 74 deletions(-)
--git a/extras/exec_cgi.rb b/extras/exec_cgi.rb
index b546e1f..15fe7de 100644
--- a/extras/exec_cgi.rb
+++ b/extras/exec_cgi.rb
@@ -21,18 +21,29 @@
# run ExecCgi.new('/path/to/cgit.cgi') # cgit: https://git.zx2c4.com/cgit/
#
class ExecCgi
- class MyIO < Kgio::Pipe
+ class MyIO
attr_writer :my_pid
attr_writer :body_tip
+ attr_reader :rd, :wr
+
+ def initialize
+ @rd, @wr = IO.pipe
+ end
def each
buf = @body_tip || ''.dup
if buf.size > 0
yield buf
end
- while tmp = kgio_read(8192, buf)
+
+ case tmp = @rd.read_nonblock(8192, buf, exception: false)
+ when String
yield tmp
- end
+ when :wait_readable
+ @rd.wait_readable
+ when nil
+ break
+ end while true
self
ensure
# do this sooner, since the response body may be buffered, we want
@@ -46,8 +57,8 @@ def close
# Note: this object (and any client-specific objects) will never
# be shared across different threads, so we do not need extra
# mutual exclusion here.
- return if closed?
- super
+ return if @rd.closed?
+ @rd.close
begin
Process.waitpid(@my_pid)
rescue Errno::ECHILD
@@ -90,20 +101,21 @@ def call(env)
cgi_env = { "GATEWAY_INTERFACE" => "CGI/1.1" }
PASS_VARS.each { |key| val = env[key] and cgi_env[key] = val }
env.each { |key,val| cgi_env[key] = val if key =~ /\AHTTP_/ }
- pipe = MyIO.pipe
- errbody = pipe[0]
+ io = MyIO.new
+ errbody = io
errbody.my_pid = Process.spawn(cgi_env.merge!(@env), *@args,
- out: pipe[1], close_others: true)
- pipe[1].close
- pipe = pipe[0]
+ out: io.wr, close_others: true)
+ io.wr.close
+ rd = io.rd
- if head = pipe.kgio_read(8192)
+ begin
+ head = rd.readpartial(8192)
until head =~ /\r?\n\r?\n/
- tmp = pipe.kgio_read(8192) or break
+ tmp = rd.readpartial(8192)
head << tmp
end
head, body = head.split(/\r?\n\r?\n/, 2)
- pipe.body_tip = body
+ io.body_tip = body
env["HTTP_VERSION"] ||= "HTTP/1.0" # stop Rack::Chunked for HTTP/0.9
@@ -117,8 +129,8 @@ def call(env)
end
status = headers.delete("Status") || 200
errbody = nil
- [ status, headers, pipe ]
- else
+ [ status, headers, io ]
+ rescue EOFError
[ 500, { "Content-Length" => "0", "Content-Type" => "text/plain" }, [] ]
end
ensure
--git a/extras/proxy_pass.rb b/extras/proxy_pass.rb
index 310da9e..9c03f42 100644
--- a/extras/proxy_pass.rb
+++ b/extras/proxy_pass.rb
@@ -9,6 +9,7 @@
require 'rack/request'
require 'thread'
require 'timeout'
+require 'io/wait'
# Totally synchronous and Rack 1.1-compatible, this will probably be rewritten.
# to take advantage of rack.hijack and use the non-blocking I/O facilities
@@ -35,11 +36,6 @@ def put(obj)
class UpstreamSocket < Kgio::Socket # :nodoc:
attr_writer :expiry
- # called automatically by kgio_read!
- def kgio_wait_readable(timeout = nil)
- super(timeout || wait_time)
- end
-
def wait_time
tout = @expiry ? @expiry - Time.now : @timeout
raise Timeout::Error, "request timed out", [] if tout < 0
@@ -47,11 +43,15 @@ def wait_time
end
def readpartial(bytes, buf = Thread.current[:proxy_pass_buf] ||= ''.dup)
- case rv = kgio_read!(bytes, buf)
- when String
+ case rv = read_nonblock(bytes, buf, exception: false)
+ when :wait_readable
+ wait_readable(wait_time)
+ when nil
+ return rv
+ else
@expiry += @timeout # bump expiry when we succeed
- end
- rv
+ return rv
+ end while true
end
def req_write(buf, timeout)
@@ -59,7 +59,7 @@ def req_write(buf, timeout)
@expiry = Time.now + timeout
case rv = kgio_trywrite(buf)
when :wait_writable
- kgio_wait_writable(wait_time)
+ wait_writable(wait_time)
when nil
return
when String
@@ -84,7 +84,8 @@ def req_write(req, timeout)
# returns true if the socket is still alive, nil if dead
def sock_alive?
- @reused = (:wait_readable == (@sock.kgio_tryread(1) rescue nil)) ?
+ @reused = (:wait_readable ==
+ (@sock.read_nonblock(1, ''.b, exception: false) rescue nil)) ?
true : @sock.close
end
diff --git a/lib/yahns.rb b/lib/yahns.rb
index a0abe49..a9a1c76 100644
--- a/lib/yahns.rb
+++ b/lib/yahns.rb
@@ -4,6 +4,7 @@
$stdout.sync = $stderr.sync = true
require 'unicorn' # pulls in raindrops, kgio, fcntl, etc, stringio, and logger
+require 'io/wait'
require 'sleepy_penguin'
# kill off some unicorn internals we don't need
diff --git a/lib/yahns/acceptor.rb b/lib/yahns/acceptor.rb
index 7ab9f60..7c0f368 100644
--- a/lib/yahns/acceptor.rb
+++ b/lib/yahns/acceptor.rb
@@ -31,7 +31,7 @@ def ac_quit
begin
# try to connect to kick it out of the blocking accept() syscall
killer = Kgio::Socket.start(getsockname)
- killer.kgio_write("G") # first byte of "GET / HTTP/1.0\r\n\r\n"
+ killer.write("G") # first byte of "GET / HTTP/1.0\r\n\r\n"
ensure
killer.close if killer
end
diff --git a/lib/yahns/client_expire_generic.rb b/lib/yahns/client_expire_generic.rb
index 59c1b46..2165af9 100644
--- a/lib/yahns/client_expire_generic.rb
+++ b/lib/yahns/client_expire_generic.rb
@@ -29,7 +29,7 @@ def kgio_trywrite(*args)
super
end
- def kgio_tryread(*args)
+ def read_nonblock(*args)
@last_io_at = __timestamp
super
end
diff --git a/lib/yahns/http_client.rb b/lib/yahns/http_client.rb
index d8154a4..f0b61fd 100644
--- a/lib/yahns/http_client.rb
+++ b/lib/yahns/http_client.rb
@@ -80,11 +80,11 @@ def input_ready
# returns true if we want to keep looping on this
# returns :wait_readable/wait_writable/nil to yield back to epoll
def fill_body(rsize, rbuf)
- case rv = kgio_tryread(rsize, rbuf)
+ case rv = read_nonblock(rsize, rbuf, exception: false)
when String
@hs.filter_body(rbuf, @hs.buf << rbuf)
@input.write(rbuf)
- true # keep looping on kgio_tryread (but check body_eof? first)
+ true # keep looping on read_nonblock (but check body_eof? first)
when :wait_readable, :wait_writable
rv # have epoll/kqueue wait for more
when nil # unexpected EOF
@@ -95,13 +95,13 @@ def fill_body(rsize, rbuf)
# returns true if we are ready to dispatch the app
# returns :wait_readable/wait_writable/nil to yield back to epoll
def read_trailers(rsize, rbuf)
- case rv = kgio_tryread(rsize, rbuf)
+ case rv = read_nonblock(rsize, rbuf, exception: false)
when String
if @hs.add_parse(rbuf)
@input.rewind
return true
end
- # keep looping on kgio_tryread...
+ # keep looping on read_nonblock...
when :wait_readable, :wait_writable
return rv # wait for more
when nil # unexpected EOF
@@ -133,7 +133,8 @@ def yahns_step
end
# continue to outer loop
when :headers
- case rv = kgio_tryread(k.client_header_buffer_size, rbuf)
+ case rv = read_nonblock(k.client_header_buffer_size, rbuf,
+ exception: false)
when String
if @hs.add_parse(rv)
case input = input_ready
@@ -143,7 +144,7 @@ def yahns_step
return app_call(input)
end
end
- # keep looping on kgio_tryread
+ # keep looping on read_nonblock
when :wait_readable, :wait_writable, nil
return rv
end while true
@@ -235,25 +236,14 @@ def app_call(input)
http_response_write(res, opt)
end
- # called automatically by kgio_write
- def kgio_wait_writable(timeout = self.class.client_timeout)
- super timeout
- end
-
- # called automatically by kgio_read
- def kgio_wait_readable(timeout = self.class.client_timeout)
- super timeout
- end
-
# used by StreamInput (and thus TeeInput) for input_buffering {false|:lazy}
def yahns_read(bytes, buf)
- case rv = kgio_tryread(bytes, buf)
+ case rv = read_nonblock(bytes, buf, exception: false)
when String, nil
return rv
- when :wait_readable
- kgio_wait_readable or raise Yahns::ClientTimeout, "waiting for read", []
- when :wait_writable
- kgio_wait_writable or raise Yahns::ClientTimeout, "waiting for write", []
+ when :wait_readable, :wait_writable
+ __send__(rv, self.class.client_timeout) or
+ raise Yahns::ClientTimeout, "on #{rv}", []
end while true
end
diff --git a/lib/yahns/http_response.rb b/lib/yahns/http_response.rb
index 865193d..86b7f56 100644
--- a/lib/yahns/http_response.rb
+++ b/lib/yahns/http_response.rb
@@ -47,11 +47,11 @@ def response_start
end
def response_wait_write(rv)
- # call the kgio_wait_readable or kgio_wait_writable method
- ok = __send__("kgio_#{rv}") and return ok
+ # call the wait_readable or wait_writable method
k = self.class
- k.logger.info("fd=#{fileno} ip=#@kgio_addr timeout on :#{rv} after "\
- "#{k.client_timeout}s")
+ t = k.client_timeout
+ ok = __send__(rv, t) and return ok
+ k.logger.info("fd=#{fileno} ip=#@kgio_addr timeout on :#{rv} after #{t}s")
false
end
diff --git a/lib/yahns/openssl_client.rb b/lib/yahns/openssl_client.rb
index 0d376bd..a86d701 100644
--- a/lib/yahns/openssl_client.rb
+++ b/lib/yahns/openssl_client.rb
@@ -13,7 +13,7 @@ def self.included(cls)
# This is a bit weird, since OpenSSL::SSL::SSLSocket wraps
# our actual socket, too, so we must take care to not blindly
# use method_missing and cause infinite recursion
- %w(sync= read write readpartial write_nonblock read_nonblock
+ %w(sync= read write readpartial write_nonblock
print printf puts gets readlines readline getc
readchar ungetc eof eof? << flush
sysread syswrite).map!(&:to_sym).each do |m|
@@ -59,7 +59,7 @@ def kgio_syssend(buf, flags)
kgio_trywrite(buf)
end
- def kgio_tryread(len, buf)
+ def read_nonblock(len, buf = nil, exception: true)
if @need_accept
# most protocols require read before write, so we start the negotiation
# process here:
@@ -69,7 +69,7 @@ def kgio_tryread(len, buf)
end
@need_accept = false
end
- @ssl.read_nonblock(len, buf, exception: false)
+ @ssl.read_nonblock(len, buf, exception: exception)
end
def trysendio(io, offset, count)
diff --git a/lib/yahns/proxy_http_response.rb b/lib/yahns/proxy_http_response.rb
index 7df2834..d9c878e 100644
--- a/lib/yahns/proxy_http_response.rb
+++ b/lib/yahns/proxy_http_response.rb
@@ -153,13 +153,13 @@ def proxy_read_body(tip, kcar, req_res)
alive = req_res.alive
wbuf = req_res.resbuf
- case tmp = tip.shift || req_res.kgio_tryread(0x2000, rbuf)
+ case tmp = tip.shift || req_res.read_nonblock(0x2000, rbuf, exception:false)
when String
if len
kcar.body_bytes_left -= tmp.size # progress for body_eof? => true
elsif chunk
kcar.filter_body(chunk, rbuf = tmp) # progress for body_eof? => true
- next if chunk.empty? # call req_res.kgio_tryread for more
+ next if chunk.empty? # call req_res.read_nonblock for more
tmp = chunk_out(chunk)
elsif alive # HTTP/1.0 upstream, HTTP/1.1 client
tmp = chunk_out(tmp)
@@ -200,7 +200,7 @@ def proxy_read_trailers(kcar, req_res)
wbuf = req_res.resbuf
until kcar.trailers(tlr, chunk)
- case rv = req_res.kgio_tryread(0x2000, rbuf)
+ case rv = req_res.read_nonblock(0x2000, rbuf, exception: false)
when String
chunk << rv
when :wait_readable
diff --git a/lib/yahns/req_res.rb b/lib/yahns/req_res.rb
index 4ad8e5c..0fa4285 100644
--- a/lib/yahns/req_res.rb
+++ b/lib/yahns/req_res.rb
@@ -29,7 +29,7 @@ def yahns_step # yahns event loop entry point
case resbuf = @resbuf # where are we at the response?
when nil # common case, catch the response header in a single read
- case rv = kgio_tryread(0x2000, buf)
+ case rv = read_nonblock(0x2000, buf, exception: false)
when String
if res = req.headers(@hdr = [], rv)
return c.proxy_response_start(res, rv, req, self)
@@ -48,7 +48,7 @@ def yahns_step # yahns event loop entry point
when String # continue reading trickled response headers from upstream
- case rv = kgio_tryread(0x2000, buf)
+ case rv = read_nonblock(0x2000, buf, exception: false)
when String then res = req.headers(@hdr, resbuf << rv) and break
when :wait_readable then return rv
when nil
diff --git a/lib/yahns/server.rb b/lib/yahns/server.rb
index 00e5f15..2f2c57a 100644
--- a/lib/yahns/server.rb
+++ b/lib/yahns/server.rb
@@ -473,7 +473,7 @@ def reap_reexec
end
def sp_sig_handle(alive)
- @sev.kgio_wait_readable(alive ? nil : 0.01)
+ @sev.wait_readable(alive ? nil : 0.01)
@sev.yahns_step
case sig = @sig_queue.shift
when :QUIT, :TERM, :INT
diff --git a/lib/yahns/server_mp.rb b/lib/yahns/server_mp.rb
index c9cd207..8982401 100644
--- a/lib/yahns/server_mp.rb
+++ b/lib/yahns/server_mp.rb
@@ -91,7 +91,7 @@ def join
@logger.info "master process ready"
daemon_ready
begin
- @sev.kgio_wait_readable
+ @sev.to_io.wait_readable
@sev.yahns_step
reap_all
case @sig_queue.shift
diff --git a/lib/yahns/sigevent_efd.rb b/lib/yahns/sigevent_efd.rb
index 1250cf4..264097d 100644
--- a/lib/yahns/sigevent_efd.rb
+++ b/lib/yahns/sigevent_efd.rb
@@ -3,7 +3,6 @@
# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
# frozen_string_literal: true
class Yahns::Sigevent < SleepyPenguin::EventFD # :nodoc:
- include Kgio::DefaultWaiters
def self.new
super(0, :CLOEXEC)
end
diff --git a/lib/yahns/sigevent_pipe.rb b/lib/yahns/sigevent_pipe.rb
index a85fb2a..00cd9e4 100644
--- a/lib/yahns/sigevent_pipe.rb
+++ b/lib/yahns/sigevent_pipe.rb
@@ -5,21 +5,17 @@
class Yahns::Sigevent # :nodoc:
attr_reader :to_io
def initialize
- @to_io, @wr = Kgio::Pipe.new
+ @to_io, @wr = IO.pipe
@to_io.close_on_exec = @wr.close_on_exec = true
end
- def kgio_wait_readable(*args)
- @to_io.kgio_wait_readable(*args)
- end
-
def sev_signal
- @wr.kgio_trywrite(".")
+ @wr.write_nonblock(".", exception: false)
end
def yahns_step
# 11 byte strings -> no malloc on YARV
- while String === @to_io.kgio_tryread(11)
+ while String === @to_io.read_nonblock(11, exception: false)
end
:wait_readable
end
diff --git a/lib/yahns/worker.rb b/lib/yahns/worker.rb
index 9192803..8886936 100644
--- a/lib/yahns/worker.rb
+++ b/lib/yahns/worker.rb
@@ -8,7 +8,7 @@ class Yahns::Worker # :nodoc:
def initialize(nr)
@nr = nr
- @to_io, @wr = Kgio::Pipe.new
+ @to_io, @wr = IO.pipe
end
def atfork_child
@@ -24,7 +24,7 @@ def atfork_parent
# This causes the worker to gracefully exit if the master
# dies unexpectedly.
def yahns_step
- case buf = @to_io.kgio_tryread(4)
+ case buf = @to_io.read_nonblock(4, exception: false)
when String
# unpack the buffer and trigger the signal handler
signum = buf.unpack('l')
@@ -60,7 +60,7 @@ def fake_sig(sig) # :nodoc:
def soft_kill(signum) # :nodoc:
# writing and reading 4 bytes on a pipe is atomic on all POSIX platforms
# Do not care in the odd case the buffer is full, here.
- @wr.kgio_trywrite([signum].pack('l'))
+ @wr.write_nonblock([signum].pack('l'), exception: false)
rescue Errno::EPIPE
# worker will be reaped soon
end
--
EW
^ permalink raw reply related [flat|nested] 3+ messages in thread* [PATCH 2/2] drop writev support
2017-03-06 3:30 [PATCH 0/2] WIP remove-kgio branch pushed branch Eric Wong
2017-03-06 3:30 ` [PATCH 1/2] remove kgio read and wait dependencies Eric Wong
@ 2017-03-06 3:30 ` Eric Wong
1 sibling, 0 replies; 3+ messages in thread
From: Eric Wong @ 2017-03-06 3:30 UTC (permalink / raw)
To: yahns-public
Since we're getting rid of kgio, we'll need to remove
writev support as it's not in mainline Ruby. I've never
checked if writev support was ever worth it for performance,
and benchmarks will be coming.
At least this simplifies req_res.rb quite a bit.
---
lib/yahns/chunk_body.rb | 15 ++++--------
lib/yahns/http_response.rb | 6 ++---
lib/yahns/openssl_client.rb | 4 ----
lib/yahns/proxy_http_response.rb | 16 +++++++------
lib/yahns/req_res.rb | 51 +++++++++++++++++++---------------------
lib/yahns/tmpio.rb | 1 -
lib/yahns/wbuf.rb | 11 +++------
test/test_tmpio.rb | 6 ++---
8 files changed, 46 insertions(+), 64 deletions(-)
diff --git a/lib/yahns/chunk_body.rb b/lib/yahns/chunk_body.rb
index aab803b..7153ad9 100644
--- a/lib/yahns/chunk_body.rb
+++ b/lib/yahns/chunk_body.rb
@@ -1,24 +1,19 @@
# -*- encoding: binary -*-
# Copyright (C) 2016 all contributors <yahns-public@yhbt.net>
# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
-# frozen_string_literal: true
+# frozen_string_literal: false
class Yahns::ChunkBody # :nodoc:
- def initialize(body, vec)
+ def initialize(body)
@body = body
- @vec = vec
end
def each
- vec = @vec
- vec[2] = "\r\n".freeze
@body.each do |chunk|
- vec[0] = "#{chunk.bytesize.to_s(16)}\r\n"
- vec[1] = chunk
- # vec[2] never changes: "\r\n" above
- yield vec
+ chunk = "#{chunk.bytesize.to_s(16)}\r\n#{chunk}\r\n"
+ yield chunk
+ chunk.clear
end
- vec.clear
yield "0\r\n\r\n".freeze
end
diff --git a/lib/yahns/http_response.rb b/lib/yahns/http_response.rb
index 86b7f56..7fa70ff 100644
--- a/lib/yahns/http_response.rb
+++ b/lib/yahns/http_response.rb
@@ -167,7 +167,7 @@ def http_response_write(res, opt)
if !term && chunk_ok && !hdr_only
term = true
- body = Yahns::ChunkBody.new(body, opt)
+ body = Yahns::ChunkBody.new(body)
buf << "Transfer-Encoding: chunked\r\n".freeze
end
alive &&= (term || hdr_only)
@@ -205,10 +205,10 @@ def http_response_write(res, opt)
if wbuf
rv = wbuf.wbuf_write(self, x)
else
- case rv = String === x ? kgio_trywrite(x) : kgio_trywritev(x)
+ case rv = kgio_trywrite(x)
when nil # all done, likely and good!
break
- when String, Array
+ when String
x = rv # hope the skb grows when we loop into the trywrite
when :wait_writable, :wait_readable
if self.class.output_buffering
diff --git a/lib/yahns/openssl_client.rb b/lib/yahns/openssl_client.rb
index a86d701..cf4941c 100644
--- a/lib/yahns/openssl_client.rb
+++ b/lib/yahns/openssl_client.rb
@@ -51,10 +51,6 @@ def kgio_trywrite(buf)
rv
end
- def kgio_trywritev(buf)
- kgio_trywrite(buf.join)
- end
-
def kgio_syssend(buf, flags)
kgio_trywrite(buf)
end
diff --git a/lib/yahns/proxy_http_response.rb b/lib/yahns/proxy_http_response.rb
index d9c878e..9f75fec 100644
--- a/lib/yahns/proxy_http_response.rb
+++ b/lib/yahns/proxy_http_response.rb
@@ -1,7 +1,7 @@
# -*- encoding: binary -*-
# Copyright (C) 2015-2016 all contributors <yahns-public@yhbt.net>
# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
-# frozen_string_literal: true
+# frozen_string_literal: false
require_relative 'wbuf_lite'
@@ -31,9 +31,9 @@ def wbuf_alloc(req_res)
def proxy_write(wbuf, buf, req_res)
unless wbuf
# no write buffer, try to write directly to the client socket
- case rv = String === buf ? kgio_trywrite(buf) : kgio_trywritev(buf)
+ case rv = kgio_trywrite(buf)
when nil then return # done writing buf, likely
- when String, Array # partial write, hope the skb grows
+ when String # partial write, hope the skb grows
buf = rv
when :wait_writable, :wait_readable
wbuf = req_res.resbuf ||= wbuf_alloc(req_res)
@@ -157,16 +157,18 @@ def proxy_read_body(tip, kcar, req_res)
when String
if len
kcar.body_bytes_left -= tmp.size # progress for body_eof? => true
+ clr = nil
elsif chunk
kcar.filter_body(chunk, rbuf = tmp) # progress for body_eof? => true
next if chunk.empty? # call req_res.read_nonblock for more
- tmp = chunk_out(chunk)
+ clr = tmp = chunk_out(chunk)
+ chunk.clear
elsif alive # HTTP/1.0 upstream, HTTP/1.1 client
- tmp = chunk_out(tmp)
+ clr = tmp = chunk_out(tmp)
# else # HTTP/1.0 upstream, HTTP/1.0 client, do nothing
end
wbuf = proxy_write(wbuf, tmp, req_res)
- chunk.clear if chunk
+ clr.clear if clr
if Yahns::WbufLite === wbuf
req_res.proxy_trailers = [ rbuf.dup, tip ] if chunk && kcar.body_eof?
return proxy_unbuffer(wbuf)
@@ -296,7 +298,7 @@ def proxy_busy_mod(wbuf, req_res)
# of String#bytesize because all the IO read methods return a binary
# string when given a maximum read length
def chunk_out(buf)
- [ "#{buf.size.to_s(16)}\r\n", buf, "\r\n".freeze ]
+ "#{buf.size.to_s(16)}\r\n#{buf}\r\n"
end
def trailer_out(tlr)
diff --git a/lib/yahns/req_res.rb b/lib/yahns/req_res.rb
index 0fa4285..958015a 100644
--- a/lib/yahns/req_res.rb
+++ b/lib/yahns/req_res.rb
@@ -1,7 +1,7 @@
# -*- encoding: binary -*-
# Copyright (C) 2013-2016 all contributors <yahns-public@yhbt.net>
# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
-# frozen_string_literal: true
+# frozen_string_literal: false
# Only used by Yahns::ProxyPass
require 'kcar' # gem install kcar
require 'kgio'
@@ -64,7 +64,7 @@ def yahns_step # yahns event loop entry point
end while true # case @resbuf
- when Array # [ (str|vec), rack.input, chunked? ]
+ when Array # [ str, rack.input, chunked? ]
send_req_body(req) # returns nil or :wait_writable
when String # buffered request header
send_req_buf(req)
@@ -80,11 +80,14 @@ def yahns_step # yahns event loop entry point
end
def send_req_body_chunk(buf)
- case rv = String === buf ? kgio_trywrite(buf) : kgio_trywritev(buf)
- when String, Array
+ case rv = kgio_trywrite(buf)
+ when nil
+ return rv # done
+ when String
buf.replace(rv) # retry loop on partial write
- when :wait_writable, nil
+ when :wait_writable
# :wait_writable = upstream is reading slowly and making us wait
+ @rrstate[0] = buf # for the next time we're called
return rv
else
abort "BUG: #{rv.inspect} from kgio_trywrite*"
@@ -92,39 +95,33 @@ def send_req_body_chunk(buf)
end
# returns :wait_readable if complete, :wait_writable if not
- def send_req_body(req) # @rrstate == [ (str|vec), rack.input, chunked? ]
+ def send_req_body(req) # @rrstate == [ str, rack.input, chunked? ]
buf, input, chunked = req
# send the first buffered chunk or vector
rv = send_req_body_chunk(buf) and return rv # :wait_writable
# yay, sent the first chunk, now read the body!
- rbuf = buf
if chunked
- if String === buf # initial body
- req[0] = buf = []
- else
- # try to reuse the biggest non-frozen buffer we just wrote;
- rbuf = buf.max_by(&:size)
- rbuf = ''.dup if rbuf.frozen? # unlikely...
+ # Note: input (env['rack.input']) is fully-buffered by default so
+ # we should not be waiting on a slow network resource when reading
+ # input. However, some weird configs may disable this on LANs
+ # and we may wait indefinitely on input.read here...
+
+ rbuf = buf
+ while input.read(0x2000, rbuf)
+ buf = "#{rbuf.size.to_s(16)}\r\n#{rbuf}\r\n"
+ rbuf.clear
+ rv = send_req_body_chunk(buf) and return rv # :wait_writable
+ buf.clear
end
- end
-
- # Note: input (env['rack.input']) is fully-buffered by default so
- # we should not be waiting on a slow network resource when reading
- # input. However, some weird configs may disable this on LANs
- # and we may wait indefinitely on input.read here...
- while input.read(0x2000, rbuf)
- if chunked
- buf[0] = "#{rbuf.size.to_s(16)}\r\n".freeze
- buf[1] = rbuf
- buf[2] = "\r\n".freeze
+ else
+ while input.read(0x2000, buf)
+ rv = send_req_body_chunk(buf) and return rv # :wait_writable
end
- rv = send_req_body_chunk(buf) and return rv # :wait_writable
+ buf.clear # all done, clear the big buffer
end
- rbuf.clear # all done, clear the big buffer
-
# we cannot use respond_to?(:close) here since Rack::Lint::InputWrapper
# tries to prevent that (and hijack means all Rack specs go out the door)
case input
diff --git a/lib/yahns/tmpio.rb b/lib/yahns/tmpio.rb
index 9e36d93..c14dc8a 100644
--- a/lib/yahns/tmpio.rb
+++ b/lib/yahns/tmpio.rb
@@ -8,7 +8,6 @@
# well with unlinked files. This one is much shorter, easier
# to understand, and slightly faster (no delegation).
class Yahns::TmpIO < File # :nodoc:
- include Kgio::PipeMethods
# creates and returns a new File object. The File is unlinked
# immediately, switched to binary mode, and userspace output
diff --git a/lib/yahns/wbuf.rb b/lib/yahns/wbuf.rb
index 3abc5f9..0eb7267 100644
--- a/lib/yahns/wbuf.rb
+++ b/lib/yahns/wbuf.rb
@@ -40,16 +40,11 @@ def initialize(body, persist)
@busy = false
end
- def wbuf_writev(buf)
- @tmpio.kgio_writev(buf)
- buf.inject(0) { |n, s| n += s.size }
- end
-
def wbuf_write(c, buf)
# try to bypass the VFS layer and write directly to the socket
# if we're all caught up
- case rv = String === buf ? c.kgio_trywrite(buf) : c.kgio_trywritev(buf)
- when String, Array
+ case rv = c.kgio_trywrite(buf)
+ when String
buf = rv # retry in loop
when nil
return # yay! hopefully we don't have to buffer again
@@ -59,7 +54,7 @@ def wbuf_write(c, buf)
@tmpio ||= Yahns::TmpIO.new(c.class.output_buffer_tmpdir)
# n.b.: we rely on O_APPEND in TmpIO, here
- @sf_count += String === buf ? @tmpio.write(buf) : wbuf_writev(buf)
+ @sf_count += @tmpio.write(buf)
# we spent some time copying to the FS, try to write to
# the socket again in case some space opened up...
diff --git a/test/test_tmpio.rb b/test/test_tmpio.rb
index 3bcf3ca..3b2ca88 100644
--- a/test/test_tmpio.rb
+++ b/test/test_tmpio.rb
@@ -9,12 +9,10 @@ def setup
skip 'sendfile missing' unless IO.instance_methods.include?(:sendfile)
end
- def test_writev
+ def test_write_and_sendfile
a, b = UNIXSocket.pair
- a.extend Kgio::PipeMethods
tmpio = Yahns::TmpIO.new(Dir.tmpdir)
- ary = [ "hello\n".freeze, "world\n".freeze ].freeze
- tmpio.kgio_trywritev(ary)
+ tmpio.write("hello\nworld\n")
a.trysendfile(tmpio, 0, 12)
assert_equal "hello\nworld\n", b.read(12)
ensure
--
EW
^ permalink raw reply related [flat|nested] 3+ messages in thread