* [PATCH] USR2 upgrades may use Process.spawn for vfork
@ 2017-03-27 20:59 Eric Wong
0 siblings, 0 replies; only message in thread
From: Eric Wong @ 2017-03-27 20:59 UTC (permalink / raw)
To: yahns-public
Remove false statements about close-on-exec being cleared in the
parent process (verified via strace) and refactor the code to
take full advantage of options for Process.spawn and Process.exec.
This avoids unnecessary CoW traffic for the common case where
before_exec is unset.
---
lib/yahns/server.rb | 33 ++++++++++++++++-----------------
1 file changed, 16 insertions(+), 17 deletions(-)
diff --git a/lib/yahns/server.rb b/lib/yahns/server.rb
index 861b919..43caae6 100644
--- a/lib/yahns/server.rb
+++ b/lib/yahns/server.rb
@@ -237,24 +237,23 @@ def reexec
end
end
- # We cannot use Process.spawn here because of redirects + close-on-exec
- # We must keep close_on_exec=true in the parent process and only set
- # close_on_exec=false in the child. There must be no opportunity
- # for the user app to ever get a listen socket with close_on_exec=false
- @reexec_pid = fork do
- redirects = {}
- @listeners.each do |sock|
- sock.close_on_exec = false
- redirects[sock.fileno] = sock
+ opt = {}
+ @listeners.each { |sock| opt[sock.fileno] = sock }
+ env = ENV.to_hash
+ env['YAHNS_FD'] = opt.keys.join(',')
+ opt[:close_others] = true
+ cmd = [ Yahns::START[0] ].concat(Yahns::START[:argv])
+ dir = @config.value(:working_directory) || Yahns::START[:cwd]
+ @logger.info "spawning #{cmd.inspect} (in #{dir})"
+ @reexec_pid = if @before_exec
+ fork do
+ Dir.chdir(dir)
+ @before_exec.call(cmd)
+ exec(env, *cmd, opt)
end
- ENV['YAHNS_FD'] = redirects.keys.join(',')
- redirects[:close_others] = true
- Dir.chdir(@config.value(:working_directory) || Yahns::START[:cwd])
- cmd = [ Yahns::START[0] ].concat(Yahns::START[:argv])
- @logger.info "executing #{cmd.inspect} (in #{Dir.pwd})"
- @before_exec.call(cmd) if @before_exec
- cmd << redirects
- exec(*cmd)
+ else
+ opt[:chdir] = dir
+ spawn(env, *cmd, opt)
end
end
--
EW
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2017-03-27 20:59 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-03-27 20:59 [PATCH] USR2 upgrades may use Process.spawn for vfork Eric Wong
yahns Ruby server user/dev discussion
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://yhbt.net/yahns-public
git clone --mirror http://ou63pmih66umazou.onion/yahns-public
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V1 yahns-public yahns-public/ https://yhbt.net/yahns-public \
yahns-public@yhbt.net yahns-public@rubyforge.org
public-inbox-index yahns-public
Example config snippet for mirrors.
Newsgroups are available over NNTP:
nntp://news.public-inbox.org/inbox.comp.lang.ruby.yahns
nntp://ou63pmih66umazou.onion/inbox.comp.lang.ruby.yahns
note: .onion URLs require Tor: https://www.torproject.org/
code repositories for the project(s) associated with this inbox:
../../../yahns.git
AGPL code for this site: git clone http://ou63pmih66umazou.onion/public-inbox.git