yahns Ruby server user/dev discussion
 help / color / mirror / code / Atom feed
* [PATCH] allow vector args to wbuf_write
@ 2015-04-03  1:53 Eric Wong
  0 siblings, 0 replies; only message in thread
From: Eric Wong @ 2015-04-03  1:53 UTC (permalink / raw)
  To: yahns-public

This allows us to write chunked response bodies without extra
copying to clients which support streaming.
---
 lib/yahns/wbuf.rb | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/lib/yahns/wbuf.rb b/lib/yahns/wbuf.rb
index ba7ea0f..fa39b9b 100644
--- a/lib/yahns/wbuf.rb
+++ b/lib/yahns/wbuf.rb
@@ -40,10 +40,11 @@ def initialize(body, persist, tmpdir, busy)
     @busy = busy # may be false
   end
 
-  def wbuf_write(client, buf)
-    # try to bypass the VFS layer if we're all caught up
-    case rv = client.kgio_trywrite(buf)
-    when String
+  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
       buf = rv # retry in loop
     when nil
       return # yay! hopefully we don't have to buffer again
@@ -52,8 +53,11 @@ def wbuf_write(client, buf)
     end until @busy
 
     @tmpio ||= Yahns::TmpIO.new(@tmpdir)
-    @sf_count += @tmpio.write(buf)
-    case rv = client.trysendfile(@tmpio, @sf_offset, @sf_count)
+    @sf_count += String === buf ? @tmpio.write(buf) : @tmpio.kgio_writev(buf)
+
+    # we spent some time copying to the FS, try to write to
+    # the socket again in case some space opened up...
+    case rv = c.trysendfile(@tmpio, @sf_offset, @sf_count)
     when Integer
       @sf_count -= rv
       @sf_offset += rv
-- 
EW


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2015-04-03  1:53 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-04-03  1:53 [PATCH] allow vector args to wbuf_write Eric Wong

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