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] avoid excess allocations for rack.hijack support
Date: Sat,  9 May 2015 01:05:46 +0000	[thread overview]
Message-ID: <1431133546-30847-1-git-send-email-e@80x24.org> (raw)

Proc object allocation is not cheap, so avoid doing it and
allow Yahns::HttpClient to be assigned as the
env["rack.hijack"] callback for Rack applications.
---
 lib/yahns/http_client.rb | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/lib/yahns/http_client.rb b/lib/yahns/http_client.rb
index 164cac9..a0fd5a4 100644
--- a/lib/yahns/http_client.rb
+++ b/lib/yahns/http_client.rb
@@ -208,7 +208,7 @@ class Yahns::HttpClient < Kgio::Socket # :nodoc:
     # check_client_connection
     if input
       env[REMOTE_ADDR] = @kgio_addr
-      env[RACK_HIJACK] = hijack_proc(env)
+      env[RACK_HIJACK] = self
       env[RACK_INPUT] = input
 
       if k.check_client_connection && @hs.headers?
@@ -228,14 +228,6 @@ class Yahns::HttpClient < Kgio::Socket # :nodoc:
     http_response_write(status, headers, body)
   end
 
-  # this is the env["rack.hijack"] callback exposed to the Rack app
-  def hijack_proc(env)
-    proc do
-      hijack_cleanup
-      env[RACK_HIJACK_IO] = self
-    end
-  end
-
   # called automatically by kgio_write
   def kgio_wait_writable(timeout = self.class.client_timeout)
     super timeout
@@ -268,6 +260,12 @@ class Yahns::HttpClient < Kgio::Socket # :nodoc:
     @input = nil # keep env["rack.input"] accessible, though
   end
 
+  # this is the env["rack.hijack"] callback exposed to the Rack app
+  def call
+    hijack_cleanup
+    @hs.env[RACK_HIJACK_IO] = self
+  end
+
   def response_hijacked(fn)
     hijack_cleanup
     fn.call(self)
-- 
EW


                 reply	other threads:[~2015-05-09  1:05 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=1431133546-30847-1-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).