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] http_client: clear some internal ivars on rack.hijack
Date: Fri, 18 Jul 2014 00:33:20 +0000	[thread overview]
Message-ID: <20140718003320.GA14749@dcvr.yhbt.net> (raw)

We should no longer need HTTP parser or input body upon hijacking.
Remove references to it so the GC can clean those up.  This relies
on the Rack application deleting "rack.input" from the Rack env,
too.
---
 Just pushed this out to git://yhbt.net/yahns
 (commit 3c56a143fe2ef00716b89dd2f115cf8ea24a7d8c)

 Disclaimer: I haven't tested hijack outside of the included test cases,
 I only use the normal HTTP stuff lynx and curl can handle :)

 lib/yahns/http_client.rb | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/lib/yahns/http_client.rb b/lib/yahns/http_client.rb
index 849095e..a294511 100644
--- a/lib/yahns/http_client.rb
+++ b/lib/yahns/http_client.rb
@@ -224,9 +224,10 @@ 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
-      self.class.queue.queue_del(self) # EPOLL_CTL_DEL
+      hijack_cleanup
       env[RACK_HIJACK_IO] = self
     end
   end
@@ -253,12 +254,19 @@ class Yahns::HttpClient < Kgio::Socket # :nodoc:
     end while true
   end
 
-  def response_hijacked(fn)
+  # allow releasing some memory if rack.hijack is used
+  def hijack_cleanup
     # we must issue EPOLL_CTL_DEL before hijacking (if we issue it at all),
     # because the hijacker may close use before we get back to the epoll worker
     # loop.  EPOLL_CTL_DEL saves about 200 bytes of unswappable kernel memory,
     # so it can matter if we have lots of hijacked sockets.
-    self.class.queue.queue_del(self)
+    self.class.queue.queue_del(self) # EPOLL_CTL_DEL
+    @input = @input.close if @input
+    @hs = nil # no need for the HTTP parser anymore
+  end
+
+  def response_hijacked(fn)
+    hijack_cleanup
     fn.call(self)
     :ignore
   end
-- 
EW

next             reply	other threads:[~2014-07-18  0:33 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-07-18  0:33 Eric Wong [this message]
2014-07-18  0:45 ` [PATCH] http_client: clear some internal ivars on rack.hijack Eric Wong

find likely ancestor, descendant, or conflicting patches for this message:
dfblob:849095e dfblob:a294511
	(help)

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: http://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=20140718003320.GA14749@dcvr.yhbt.net \
    --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

Code repositories for project(s) associated with this public inbox

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