yahns Ruby server user/dev discussion
 help / color / mirror / code / Atom feed
From: Eric Wong <bofh@yhbt.net>
To: yahns-public@yhbt.net
Subject: [PATCH 3/4] standardize on 16384-byte reads
Date: Thu, 22 Dec 2022 09:02:10 +0000	[thread overview]
Message-ID: <20221222090211.9056-4-bofh@yhbt.net> (raw)
In-Reply-To: <20221222090211.9056-1-bofh@yhbt.net>

This is the size used by Ruby internally for IO.copy_stream.
8192 seems too small nowadays with the higher cost of syscalls.
---
 lib/yahns/http_client.rb         | 2 +-
 lib/yahns/proxy_http_response.rb | 4 ++--
 lib/yahns/req_res.rb             | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/yahns/http_client.rb b/lib/yahns/http_client.rb
index b6b6035..826eb8d 100644
--- a/lib/yahns/http_client.rb
+++ b/lib/yahns/http_client.rb
@@ -315,7 +315,7 @@ def app_hijacked?(env, res)
   end
 
   def do_pread(io, count, offset)
-    count = 0x4000 if count > 0x4000
+    count = 16384 if count > 16384
     buf = Thread.current[:yahns_sfbuf] ||= ''.dup
     if io.respond_to?(:pread)
       io.pread(count, offset, buf)
diff --git a/lib/yahns/proxy_http_response.rb b/lib/yahns/proxy_http_response.rb
index d4a3dda..db9c4b7 100644
--- a/lib/yahns/proxy_http_response.rb
+++ b/lib/yahns/proxy_http_response.rb
@@ -147,7 +147,7 @@ def proxy_res_headers(res, req_res)
   end
 
   def read_len(len)
-    max = 0x2000
+    max = 16384
     max = len if len && len < max
     max
   end
@@ -206,7 +206,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.kgio_tryread(16384, rbuf)
       when String
         chunk << rv
       when :wait_readable
diff --git a/lib/yahns/req_res.rb b/lib/yahns/req_res.rb
index 4ad8e5c..283fea8 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 = kgio_tryread(16384, buf)
         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 = kgio_tryread(16384, buf)
         when String then res = req.headers(@hdr, resbuf << rv) and break
         when :wait_readable then return rv
         when nil
@@ -114,7 +114,7 @@ def send_req_body(req) # @rrstate == [ (str|vec), rack.input, chunked? ]
     # 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)
+    while input.read(16384, rbuf)
       if chunked
         buf[0] = "#{rbuf.size.to_s(16)}\r\n".freeze
         buf[1] = rbuf

  parent reply	other threads:[~2022-12-22  9:02 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-12-22  9:02 [PATCH 0/4] a few forgotten patches from last year Eric Wong
2022-12-22  9:02 ` [PATCH 1/4] test_buffer_tmpdir: drop fragile assertions Eric Wong
2022-12-22  9:02 ` [PATCH 2/4] http_response: clamp body read size Eric Wong
2022-12-22  9:02 ` Eric Wong [this message]
2022-12-22  9:02 ` [PATCH 4/4] test/test_ssl: workaround multi-line exception messages Eric Wong

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://yhbt.net/yahns/README

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20221222090211.9056-4-bofh@yhbt.net \
    --to=bofh@yhbt.net \
    --cc=yahns-public@yhbt.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://yhbt.net/yahns.git/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).