yahns Ruby server user/dev discussion
 help / color / mirror / code / Atom feed
From: Eric Wong <e@80x24.org>
To: yahns-public@yhbt.net
Subject: [PATCH] use IO#pread if available in Ruby 2.5
Date: Mon, 16 Jul 2018 11:46:20 +0000	[thread overview]
Message-ID: <20180716114620.6207-1-e@80x24.org> (raw)

In the future, this will allow sharing open files across
different clients when serving static files.  For now, it
saves us one syscall.
---
 lib/yahns/http_client.rb    | 19 +++++++++++++++----
 lib/yahns/openssl_client.rb |  5 +----
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/lib/yahns/http_client.rb b/lib/yahns/http_client.rb
index fd97624..d55a0db 100644
--- a/lib/yahns/http_client.rb
+++ b/lib/yahns/http_client.rb
@@ -322,12 +322,23 @@ def app_hijacked?(env, res)
     true
   end
 
-  def trysendio(io, offset, count)
-    return 0 if count == 0
+  def do_pread(io, count, offset)
     count = 0x4000 if count > 0x4000
     buf = Thread.current[:yahns_sfbuf] ||= ''.dup
-    io.pos = offset
-    str = io.read(count, buf) or return # nil for EOF
+    if io.respond_to?(:pread)
+      io.pread(count, offset, buf)
+    else
+      io.pos = offset
+      io.read(count, buf)
+    end
+  rescue EOFError
+    warn "BUG: do_pread overreach:\n #{caller.join("\n ")}\n"
+    nil
+  end
+
+  def trysendio(io, offset, count)
+    return 0 if count == 0
+    str = do_pread(io, count, offset) or return # nil for EOF
     n = 0
     case rv = kgio_trywrite(str)
     when String # partial write, keep trying
diff --git a/lib/yahns/openssl_client.rb b/lib/yahns/openssl_client.rb
index c090083..d3caacb 100644
--- a/lib/yahns/openssl_client.rb
+++ b/lib/yahns/openssl_client.rb
@@ -93,10 +93,7 @@ def trysendio(io, offset, count)
 
     case buf = @ssl_blocked
     when nil
-      count = 0x4000 if count > 0x4000
-      buf = Thread.current[:yahns_sfbuf] ||= ''.dup
-      io.pos = offset
-      buf = io.read(count, buf) or return # nil for EOF
+      buf = do_pread(io, count, offset) or return # nil for EOF
       buf = @ssl_blocked = buf.dup
     when Exception
       raise buf
-- 
EW


                 reply	other threads:[~2018-07-16 11:46 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=20180716114620.6207-1-e@80x24.org \
    --to=e@80x24.org \
    --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 inbox:

	../../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).