From: Eric Wong <bofh@yhbt.net>
To: Jean Boussier <jean.boussier@gmail.com>
Cc: raindrops-public@yhbt.net
Subject: [PATCH v3] middleware: reuse inet_diag netlink socket
Date: Fri, 29 Dec 2023 17:44:18 +0000 [thread overview]
Message-ID: <20231229174418.M259631@dcvr> (raw)
In-Reply-To: <20230930233506.M141715@dcvr>
Eric Wong <bofh@yhbt.net> wrote:
> I'll squash this in for fork+preload safety.
I forget there are multithreaded servers using this :x
------8<-----
Subject: [PATCH v3] middleware: reuse inet_diag netlink socket
No point in constantly allocating and deallocating FDs (and Ruby
IO objects) when reusing them is supported.
However, we must guard it against parallel callers since
linux_inet_diag.c::diag releases the GVL while calling
sendmsg(2) and recvmsg(2), so it's possible two Ruby threads can
end up crossing streams if the middlware is used with a
multi-threaded server.
AFAIK, Raindrops::Middleware isn't a heavily-trafficked endpoint,
so saving FDs and avoiding thread specific data is preferable
for memory-constrained systems I use.
---
lib/raindrops/middleware.rb | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/lib/raindrops/middleware.rb b/lib/raindrops/middleware.rb
index d5e3927..20e573c 100644
--- a/lib/raindrops/middleware.rb
+++ b/lib/raindrops/middleware.rb
@@ -1,5 +1,6 @@
# -*- encoding: binary -*-
require 'raindrops'
+require 'thread'
# Raindrops::Middleware is Rack middleware that allows snapshotting
# current activity from an HTTP request. For all operating systems,
@@ -93,11 +94,12 @@ def initialize(app, opts = {})
@app = app
@stats = opts[:stats] || Stats.new
@path = opts[:path] || "/_raindrops"
+ @mtx = Mutex.new
tmp = opts[:listeners]
if tmp.nil? && defined?(Unicorn) && Unicorn.respond_to?(:listener_names)
tmp = Unicorn.listener_names
end
- @tcp = @unix = nil
+ @nl_sock = @tcp = @unix = nil
if tmp
@tcp = tmp.grep(/\A.+:\d+\z/)
@@ -129,9 +131,12 @@ def stats_response # :nodoc:
"writing: #{@stats.writing}\n"
if defined?(Raindrops::Linux.tcp_listener_stats)
- Raindrops::Linux.tcp_listener_stats(@tcp).each do |addr,stats|
- body << "#{addr} active: #{stats.active}\n" \
- "#{addr} queued: #{stats.queued}\n"
+ @mtx.synchronize do
+ @nl_sock ||= Raindrops::InetDiagSocket.new
+ Raindrops::Linux.tcp_listener_stats(@tcp, @nl_sock).each do |addr,stats|
+ body << "#{addr} active: #{stats.active}\n" \
+ "#{addr} queued: #{stats.queued}\n"
+ end
end if @tcp
Raindrops::Linux.unix_listener_stats(@unix).each do |addr,stats|
body << "#{addr} active: #{stats.active}\n" \
prev parent reply other threads:[~2023-12-29 17:44 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-23 9:56 [PATCH] tcp_listener_stats: always eagerly close sockets Jean Boussier
2023-09-26 21:40 ` Eric Wong
2023-09-30 23:13 ` [PATCH] middleware: reuse inet_diag netlink socket Eric Wong
2023-09-30 23:35 ` [squash] make reusing inet_diag sock fork+preload safe Eric Wong
2023-12-29 17:44 ` Eric Wong [this message]
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=20231229174418.M259631@dcvr \
--to=bofh@yhbt.net \
--cc=jean.boussier@gmail.com \
--cc=raindrops-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/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).