From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS57860 185.129.60.0/22 X-Spam-Status: No, score=-2.6 required=3.0 tests=BAYES_00,RCVD_IN_MSPIKE_BL, RCVD_IN_MSPIKE_ZBI,RCVD_IN_XBL,SPF_FAIL,SPF_HELO_FAIL shortcircuit=no autolearn=no autolearn_force=no version=3.4.0 Received: from 80x24.org (tor02.zencurity.dk [185.129.62.63]) by dcvr.yhbt.net (Postfix) with ESMTP id 6CDC01FC19 for ; Fri, 24 Mar 2017 22:29:10 +0000 (UTC) From: Eric Wong To: spew@80x24.org Subject: [PATCH] USR2 upgrades may use Process.spawn for vfork Date: Fri, 24 Mar 2017 22:29:07 +0000 Message-Id: <20170324222907.13961-1-yahns-public@yhbt.net> List-Id: 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