From: Eric Wong <e@80x24.org> To: Simon Eskildsen <simon.eskildsen@shopify.com>, unicorn-public@bogomips.org Cc: raindrops-public@bogomips.org, Jeremy Evans <code@jeremyevans.net> Subject: [PATCH (ccc)] http_request: support proposed Raindrops::TCP states on Date: Tue, 21 Mar 2017 02:55:54 +0000 [thread overview] Message-ID: <20170321025554.GA15807@starla> (raw) In-Reply-To: <20170316031652.17433-1-e@80x24.org> TCP states names/numbers seem stable for each OS, but differ in name and numeric values between them. So I started upon this patch series for raindrops last week: https://bogomips.org/raindrops-public/20170316031652.17433-1-e@80x24.org/T/ And things seem to be alright, for the most part. Anyways here's a proposed patch for unicorn which takes advantage of the above (proposed) changes for raindrops and will allow unicorn to support check_client_connection Also Cc:-ing Jeremy to see if he has any input on the OpenBSD side of things. This goes on top of commit 20c66dbf1ebd0ca993e7a79c9d0d833d747df358 ("http_request: reduce insn size for check_client_connection") at: git://bogomips.org/unicorn ccc-tcp-v3 -------8<-------- Subject: [PATCH] http_request: support proposed Raindrops::TCP states on non-Linux raindrops 0.18+ will have Raindrops::TCP state hash for portable mapping of TCP states to their respective numeric values. This was necessary because TCP state numbers (and even macro names) differ between FreeBSD and Linux (and possibly other OSes). Favor using the Raindrops::TCP state hash if available, but fall back to the hard-coded values since older versions of raindrops did not support TCP_INFO on non-Linux systems. While we're in the area, favor "const_defined?" over "defined?" to reduce the inline constant cache footprint for branches which are only evaluated once. Patches to implement Raindrops::TCP for FreeBSD are available at: https://bogomips.org/raindrops-public/20170316031652.17433-1-e@80x24.org/T/ --- lib/unicorn/http_request.rb | 38 +++++++++++++++++++++++++++++--------- 1 file changed, 29 insertions(+), 9 deletions(-) diff --git a/lib/unicorn/http_request.rb b/lib/unicorn/http_request.rb index 9010007..7253497 100644 --- a/lib/unicorn/http_request.rb +++ b/lib/unicorn/http_request.rb @@ -105,7 +105,7 @@ def hijacked? env.include?('rack.hijack_io'.freeze) end - if defined?(Raindrops::TCP_Info) + if Raindrops.const_defined?(:TCP_Info) TCPI = Raindrops::TCP_Info.allocate def check_client_connection(socket) # :nodoc: @@ -118,14 +118,34 @@ def check_client_connection(socket) # :nodoc: end end - def closed_state?(state) # :nodoc: - case state - when 1 # ESTABLISHED - false - when 8, 6, 7, 9, 11 # CLOSE_WAIT, TIME_WAIT, CLOSE, LAST_ACK, CLOSING - true - else - false + if Raindrops.const_defined?(:TCP) + # raindrops 0.18.0+ supports FreeBSD + Linux using the same names + # Evaluate these hash lookups at load time so we can + # generate an opt_case_dispatch instruction + eval <<-EOS + def closed_state?(state) # :nodoc: + case state + when #{Raindrops::TCP[:ESTABLISHED]} + false + when #{Raindrops::TCP.values_at( + :CLOSE_WAIT, :TIME_WAIT, :CLOSE, :LAST_ACK, :CLOSING).join(',')} + true + else + false + end + end + EOS + else + # raindrops before 0.18 only supported TCP_INFO under Linux + def closed_state?(state) # :nodoc: + case state + when 1 # ESTABLISHED + false + when 8, 6, 7, 9, 11 # CLOSE_WAIT, TIME_WAIT, CLOSE, LAST_ACK, CLOSING + true + else + false + end end end else -- EW
next prev parent reply other threads:[~2017-03-21 2:55 UTC|newest] Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-03-16 3:16 [PATCH 0/2] support TCP_INFO under FreeBSD Eric Wong 2017-03-16 3:16 ` [PATCH 1/2] tcp_info: support this struct " Eric Wong 2017-03-16 3:16 ` [PATCH 2/2] define Raindrops::TCP hash for TCP states Eric Wong 2017-03-21 2:55 ` Eric Wong [this message] 2017-03-21 7:50 ` [PATCH (ccc)] http_request: support proposed Raindrops::TCP states on Simon Eskildsen 2017-03-21 8:19 ` Eric Wong 2017-03-21 18:48 ` Jeremy Evans 2017-03-21 19:12 ` Eric Wong
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/raindrops/ * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20170321025554.GA15807@starla \ --to=e@80x24.org \ --cc=code@jeremyevans.net \ --cc=raindrops-public@bogomips.org \ --cc=simon.eskildsen@shopify.com \ --cc=unicorn-public@bogomips.org \ --subject='Re: [PATCH (ccc)] http_request: support proposed Raindrops::TCP states on' \ /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 inbox: ../../raindrops.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).