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] use String#clear for short-lived buffers we create
Date: Mon,  4 Jan 2016 12:07:02 +0000	[thread overview]
Message-ID: <20160104120702.10417-1-e@80x24.org> (raw)

This should reduce memory pressure slightly as we can
have finer-grained control of memory usage for buffers which
can be several kilobytes large.

It is not safe to do this for output buffers we get from the
application, as they may reuse that memory themselves.
---
 lib/yahns/http_response.rb    | 6 ++++--
 lib/yahns/max_body/wrapper.rb | 2 ++
 lib/yahns/tee_input.rb        | 1 +
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/yahns/http_response.rb b/lib/yahns/http_response.rb
index 292fab7..4b36db2 100644
--- a/lib/yahns/http_response.rb
+++ b/lib/yahns/http_response.rb
@@ -162,11 +162,13 @@ def http_response_write(status, headers, body)
                     : "Connection: close\r\n\r\n".freeze)
       case rv = kgio_syssend(buf, flags)
       when nil # all done, likely
+        buf.clear
+        buf = nil # recycle any memory we used ASAP
         break
       when String
         flags = MSG_DONTWAIT
-        buf = rv # hope the skb grows
-      when :wait_writable, :wait_readable
+        buf = rv # unlikely, hope the skb grows
+      when :wait_writable, :wait_readable # unlikely
         if k.output_buffering
           alive = hijack ? hijack : alive
           rv = response_header_blocked(rv, buf, body, alive, offset, count)
diff --git a/lib/yahns/max_body/wrapper.rb b/lib/yahns/max_body/wrapper.rb
index b75c3b6..b6ca1a3 100644
--- a/lib/yahns/max_body/wrapper.rb
+++ b/lib/yahns/max_body/wrapper.rb
@@ -48,6 +48,7 @@ def gets
 
       if tmp = checked_read(16384)
         @rbuf << tmp
+        tmp.clear
       elsif @rbuf.empty? # EOF
         return nil
       else # EOF, return whatever is left
@@ -69,6 +70,7 @@ def read_all
     while checked_read(16384, tmp)
       rv << tmp
     end
+    tmp.clear
     rv
   end
 end
diff --git a/lib/yahns/tee_input.rb b/lib/yahns/tee_input.rb
index 55b1604..93ec148 100644
--- a/lib/yahns/tee_input.rb
+++ b/lib/yahns/tee_input.rb
@@ -100,6 +100,7 @@ def consume!
     junk = ''.dup
     rsize = __rsize
     nil while read(rsize, junk)
+    junk.clear
   end
 
   def tee(buffer)
-- 
EW


                 reply	other threads:[~2016-01-04 12:07 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=20160104120702.10417-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).