From: Eric Wong <e@80x24.org>
To: yahns-public@yhbt.net
Subject: [PATCH] test_wbuf: deal with proper zero-copy for Unix sockets
Date: Tue, 1 Dec 2015 03:48:42 +0000 [thread overview]
Message-ID: <20151201034842.25851-1-e@80x24.org> (raw)
Linux 4.2 gained the ability to do true zero-copy sendfile support
for Unix sockets; so buffer space is accounted differently.
Previously Linux only avoided copies in userspace when doing
sendfile for Unix sockets, not internally within the kernel.
This kernel change has no bearing on normal code which would need to
account for concurrent draining by the client; only test code
designed to create a failure condition.
---
test/test_wbuf.rb | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/test/test_wbuf.rb b/test/test_wbuf.rb
index 0eacb08..0d7959c 100644
--- a/test/test_wbuf.rb
+++ b/test/test_wbuf.rb
@@ -71,8 +71,17 @@ class TestWbuf < Testcase
end while true
end
wbuf = Yahns::Wbuf.new([], true, Dir.tmpdir, :wait_writable)
- assert_equal :wait_writable, wbuf.wbuf_write(a, buf)
- assert_equal :wait_writable, wbuf.wbuf_flush(a)
+
+ rv1 = wbuf.wbuf_write(a, buf)
+ rv2 = wbuf.wbuf_flush(a)
+ case rv1
+ when nil
+ assert_equal true, rv2, 'some kernels succeed with real sendfile'
+ when :wait_writable
+ assert_equal :wait_writable, rv2, 'some block on sendfile'
+ else
+ flunk "unexpected from wbuf_write/flush: #{rv1.inspect} / #{rv2.inspect}"
+ end
# drain the buffer
Timeout.timeout(10) { b.read(b.nread) until b.nread == 0 }
--
EW
reply other threads:[~2015-12-01 3:48 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=20151201034842.25851-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 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).