From: Eric Wong <e@80x24.org>
To: yahns-public@yhbt.net
Cc: e@80x24.org
Subject: [PATCH 6/6] sendfile_compat: remove dependency on pread
Date: Thu, 20 Nov 2014 20:45:42 +0000 [thread overview]
Message-ID: <1416516342-18987-7-git-send-email-e@80x24.org> (raw)
In-Reply-To: <1416516342-18987-1-git-send-email-e@80x24.org>
We only need to open files with O_APPEND to allow appending to the
temporary buffer while leaving the read offset unchanged.
---
INSTALL | 4 +---
lib/yahns/sendfile_compat.rb | 12 +++++-------
lib/yahns/tmpio.rb | 2 +-
3 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/INSTALL b/INSTALL
index 87acc53..fcc92f2 100644
--- a/INSTALL
+++ b/INSTALL
@@ -10,6 +10,4 @@ more details.
Debian GNU/kFreeBSD:
For now, you will need to define SENDFILE_BROKEN=1 in the env before
-running yahns, and also install the "io-extra" RubyGem (tested on 1.2.7)
-
- gem install -v 1.2.7 io-extra
+running yahns.
diff --git a/lib/yahns/sendfile_compat.rb b/lib/yahns/sendfile_compat.rb
index e3f53d1..f324075 100644
--- a/lib/yahns/sendfile_compat.rb
+++ b/lib/yahns/sendfile_compat.rb
@@ -1,25 +1,23 @@
# -*- encoding: binary -*-
# Copyright (C) 2009-2014, Eric Wong <normalperson@yhbt.net> et. al.
# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
-require 'io/extra' # gem install io-extra
module Yahns::SendfileCompat
def trysendfile(io, offset, count)
return 0 if count == 0
count = 0x4000 if count > 0x4000
- str = IO.pread(io.fileno, count, offset)
- if count > str.bytesize
- raise EOFError, "end of file reached"
- end
+ buf = Thread.current[:yahns_sfbuf] ||= ''
+ io.pos = offset
+ str = io.read(count, buf) or return # nil for EOF
n = 0
case rv = kgio_trywrite(str)
when String # partial write, keep trying
- n += (str.bytesize - rv.bytesize)
+ n += (str.size - rv.size)
str = rv
when :wait_writable, :wait_readable
return n > 0 ? n : rv
when nil
- return n + str.bytesize # yay!
+ return n + str.size # yay!
end while true
end
end
diff --git a/lib/yahns/tmpio.rb b/lib/yahns/tmpio.rb
index 19da658..f0ddd2f 100644
--- a/lib/yahns/tmpio.rb
+++ b/lib/yahns/tmpio.rb
@@ -14,7 +14,7 @@ class Yahns::TmpIO < File # :nodoc:
def self.new(tmpdir = Dir.tmpdir)
retried = false
begin
- fp = super("#{tmpdir}/#{rand}", RDWR|CREAT|EXCL, 0600)
+ fp = super("#{tmpdir}/#{rand}", RDWR|CREAT|EXCL|APPEND, 0600)
rescue Errno::EEXIST
retry
rescue Errno::EMFILE, Errno::ENFILE
--
EW
prev parent reply other threads:[~2014-11-20 20:45 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-20 20:45 [PATCH 0/6] misc minor updates Eric Wong
2014-11-20 20:45 ` [PATCH 1/6] http_response: remove arg for Array#join Eric Wong
2014-11-20 20:45 ` [PATCH 2/6] remove unused client_max_header_size config Eric Wong
2014-11-20 20:45 ` [PATCH 3/6] config: use literal symbol array for now Eric Wong
2014-11-20 20:45 ` [PATCH 4/6] http_response: reduce constants for 100 responses Eric Wong
2014-11-20 20:45 ` [PATCH 5/6] favor Array#map! for freshly-split arrays Eric Wong
2014-11-20 20:45 ` Eric Wong [this message]
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=1416516342-18987-7-git-send-email-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 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).