yahns 0.0.1 → 0.0.2

data/lib/yahns/server_mp.rb

@@ -4,35 +4,10 @@
 module Yahns::ServerMP # :nodoc:
   EXIT_SIGS = [ :QUIT, :TERM, :INT ]
 
-  def mp_init
-    trap(:CHLD) { @sev.sev_signal }
-  end
-
-  # reaps all unreaped workers
-  def reap_all_workers
-    begin
-      wpid, status = Process.waitpid2(-1, Process::WNOHANG)
-      wpid or return
-      if @reexec_pid == wpid
-        @logger.error "reaped #{status.inspect} exec()-ed"
-        @reexec_pid = 0
-        self.pid = @pid.chomp('.oldbin') if @pid
-        proc_name 'master'
-      else
-        worker = @workers.delete(wpid)
-        worker_id = worker ? worker.nr : "(unknown)"
-        m = "reaped #{status.inspect} worker=#{worker_id}"
-        status.success? ? @logger.info(m) : @logger.error(m)
-      end
-    rescue Errno::ECHILD
-      return
-    end while true
-  end
-
   def maintain_worker_count
     (off = @workers.size - @worker_processes) == 0 and return
     off < 0 and return spawn_missing_workers
-    @workers.each_pair do |wpid, worker|
+    @workers.each do |wpid, worker|
       worker.nr >= @worker_processes and Process.kill(:QUIT, wpid)
     end
   end
@@ -47,7 +22,7 @@ module Yahns::ServerMP # :nodoc:
   # to free some resources and drops all sig handlers.
   # traps for USR1, USR2, and HUP may be set in the after_fork Proc
   # by the user.
-  def after_fork_internal(worker)
+  def worker_atfork_internal(worker)
     worker.atfork_child
 
     # daemon_pipe may be true for non-initial workers
@@ -71,8 +46,14 @@ module Yahns::ServerMP # :nodoc:
     Yahns::START.clear
     @sev.close
     @sev = Yahns::Sigevent.new
-    worker.user(*@user) if @user
+    switch_user(*@user) if @user
     @user = @workers = nil
+    __call_hooks(@atfork_child, worker.nr)
+    @atfork_child = @atfork_parent = @atfork_prepare = nil
+  end
+
+  def __call_hooks(ary, worker_nr)
+    ary.each { |x| x.call(worker_nr) } if ary
   end
 
   def spawn_missing_workers
@@ -81,10 +62,13 @@ module Yahns::ServerMP # :nodoc:
       @workers.value?(worker_nr) and next
       worker = Yahns::Worker.new(worker_nr)
       @logger.info("worker=#{worker_nr} spawning...")
+      __call_hooks(@atfork_prepare, worker_nr)
       if pid = fork
         @workers[pid] = worker.atfork_parent
+        # XXX is this useful?
+        __call_hooks(@atfork_parent, worker_nr)
       else
-        after_fork_internal(worker)
+        worker_atfork_internal(worker)
         run_mp_worker(worker)
       end
     end
@@ -106,10 +90,10 @@ module Yahns::ServerMP # :nodoc:
     begin
       @sev.kgio_wait_readable
       @sev.yahns_step
-      reap_all_workers
+      reap_all
       case @sig_queue.shift
       when *EXIT_SIGS # graceful shutdown (twice for non graceful)
-        self.listeners = []
+        @listeners.each(&:close).clear
         kill_each_worker(:QUIT)
         state = :QUIT
       when :USR1 # rotate logs
@@ -158,20 +142,23 @@ module Yahns::ServerMP # :nodoc:
   def run_mp_worker(worker)
     fdmap = fdmap_init_mp
     alive = true
+    watch = [ worker, @sev ]
     begin
-      alive = mp_sig_handle(worker, alive)
+      alive = mp_sig_handle(watch, alive)
     rescue => e
       Yahns::Log.exception(@logger, "main worker loop", e)
-    end while alive || fdmap.size > 0
+    end while alive || dropping(fdmap)
     exit
   ensure
     quit_finish
   end
 
-  def mp_sig_handle(worker, alive)
+  def mp_sig_handle(watch, alive)
     # not performance critical
-    r = IO.select([worker, @sev], nil, nil, alive ? nil : 0.01) and
+    watch.delete_if { |io| io.to_io.closed? }
+    if r = IO.select(watch, nil, nil, alive ? nil : 0.01)
       r[0].each { |io| io.yahns_step }
+    end
     case @sig_queue.shift
     when *EXIT_SIGS
       return quit_enter(alive)
@@ -180,4 +167,25 @@ module Yahns::ServerMP # :nodoc:
     end
     alive
   end
+
+  # reaps all unreaped workers/reexec processes
+  def reap_all
+    begin
+      wpid, status = Process.waitpid2(-1, Process::WNOHANG)
+      wpid or return
+      if @reexec_pid == wpid
+        @logger.error "reaped #{status.inspect} exec()-ed"
+        @reexec_pid = 0
+        self.pid = @pid.chomp('.oldbin') if @pid
+        proc_name('master')
+      else
+        worker = @workers.delete(wpid)
+        desc = worker ? "worker=#{worker.nr}" : "(unknown)"
+        m = "reaped #{status.inspect} #{desc}"
+        status.success? ? @logger.info(m) : @logger.error(m)
+      end
+    rescue Errno::ECHILD
+      return
+    end while true
+  end
 end

data/lib/yahns/sigevent_pipe.rb

@@ -5,6 +5,7 @@ class Yahns::Sigevent # :nodoc:
   attr_reader :to_io
   def initialize
     @to_io, @wr = Kgio::Pipe.new
+    @to_io.close_on_exec = @wr.close_on_exec = true
   end
 
   def kgio_wait_readable

data/lib/yahns/socket_helper.rb

@@ -3,8 +3,24 @@
 # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
 # this is only meant for Yahns::Server
 module Yahns::SocketHelper # :nodoc:
+
+  # Linux got SO_REUSEPORT in 3.9, BSDs have had it for ages
+  def so_reuseport
+    if defined?(Socket::SO_REUSEPORT)
+      Socket::SO_REUSEPORT
+    elsif RUBY_PLATFORM =~ /linux/
+      if RUBY_PLATFORM =~ /(?:alpha|mips|parisc|sparc)/
+        0x0200 # untested
+      else
+        15 # only tested on x86_64 and i686
+      end
+    else
+      nil
+    end
+  end
+
   def set_server_sockopt(sock, opt)
-    opt = {backlog: 1024}.merge!(opt) if opt
+    opt = {backlog: 1024}.merge!(opt || {})
     sock.close_on_exec = true
 
     TCPSocket === sock and sock.setsockopt(:IPPROTO_TCP, :TCP_NODELAY, 1)
@@ -26,6 +42,7 @@ module Yahns::SocketHelper # :nodoc:
     rcvbuf = sock.getsockopt(:SOL_SOCKET, :SO_RCVBUF).int
     sndbuf = sock.getsockopt(:SOL_SOCKET, :SO_SNDBUF).int
     @logger.info("#{pfx}#{sock_name(sock)} rcvbuf=#{rcvbuf} sndbuf=#{sndbuf}")
+  rescue # TODO: get this fixed in rbx
   end
 
   # creates a new server, socket. address may be a HOST:PORT or
@@ -53,14 +70,14 @@ module Yahns::SocketHelper # :nodoc:
       end
       old_umask = File.umask(opt[:umask] || 0)
       begin
-        Kgio::UNIXServer.new(address)
+        Yahns::UNIXServer.new(address)
       ensure
         File.umask(old_umask)
       end
     elsif /\A\[([a-fA-F0-9:]+)\]:(\d+)\z/ =~ address
-      new_ipv6_server($1, $2.to_i, opt)
+      new_tcp_server($1, $2.to_i, opt.merge(ipv6: true))
     elsif /\A(\d+\.\d+\.\d+\.\d+):(\d+)\z/ =~ address
-      Kgio::TCPServer.new($1, $2.to_i)
+      new_tcp_server($1, $2.to_i, opt)
     else
       raise ArgumentError, "Don't know how to bind: #{address}"
     end
@@ -68,14 +85,23 @@ module Yahns::SocketHelper # :nodoc:
     sock
   end
 
-  def new_ipv6_server(addr, port, opt)
-    opt.key?(:ipv6only) or return Kgio::TCPServer.new(addr, port)
-    sock = Socket.new(:AF_INET6, :SOCK_STREAM, 0)
-    sock.setsockopt(:IPPROTO_IPV6, :IPV6_V6ONLY, opt[:ipv6only] ? 1 : 0)
+  def new_tcp_server(addr, port, opt)
+    sock = Socket.new(opt[:ipv6] ? :INET6 : :INET, :STREAM, 0)
+    if opt.key?(:ipv6only)
+      sock.setsockopt(:IPPROTO_IPV6, :IPV6_V6ONLY, opt[:ipv6only] ? 1 : 0)
+    end
     sock.setsockopt(:SOL_SOCKET, :SO_REUSEADDR, 1)
+
+    begin
+      sock.setsockopt(:SOL_SOCKET, so_reuseport, 1)
+    rescue => e
+      name = sock_name(sock)
+      @logger.warn("failed to set SO_REUSEPORT on #{name}: #{e.message}")
+    end if opt[:reuseport]
+
     sock.bind(Socket.pack_sockaddr_in(port, addr))
     sock.autoclose = false
-    Kgio::TCPServer.for_fd(sock.fileno)
+    Yahns::TCPServer.for_fd(sock.fileno)
   end
 
   # returns rfc2732-style (e.g. "[::1]:666") addresses for IPv6
@@ -110,9 +136,9 @@ module Yahns::SocketHelper # :nodoc:
     sock.autoclose = false
     begin
       Socket.unpack_sockaddr_in(sock.getsockname)
-      Kgio::TCPServer.for_fd(sock.fileno)
+      Yahns::TCPServer.for_fd(sock.fileno)
     rescue ArgumentError
-      Kgio::UNIXServer.for_fd(sock.fileno)
+      Yahns::UNIXServer.for_fd(sock.fileno)
     end
   end
 end

data/lib/yahns/stream_file.rb

@@ -6,6 +6,9 @@ require_relative 'wbuf_common'
 class Yahns::StreamFile # :nodoc:
   include Yahns::WbufCommon
 
+  # do not use this in your app (or any of our API)
+  NeedClose = Class.new(File) # :nodoc:
+
   def initialize(body, persist, offset, count)
     if body.respond_to?(:to_io)
       @tmpio = body.to_io
@@ -15,7 +18,16 @@ class Yahns::StreamFile # :nodoc:
         @tmpio = IO.for_fd($1.to_i)
         @tmpio.autoclose = false
       else
-        @tmpio = File.open(path)
+        retried = false
+        begin
+          @tmpio = NeedClose.open(path)
+        rescue Errno::EMFILE, Errno::ENFILE
+          raise if retried
+          retried = true
+          Thread.current[:yahns_fdmap].desperate_expire_for(nil, 5)
+          sleep(1)
+          retry
+        end
       end
     end
     @sf_offset = offset
@@ -26,9 +38,7 @@ class Yahns::StreamFile # :nodoc:
 
   # called by last wbuf_flush
   def wbuf_close(client)
-    if File === @tmpio && @tmpio != @body
-      @tmpio.close
-    end
+    @tmpio.close if NeedClose === @tmpio
     wbuf_close_common(client)
   end
 end

data/lib/yahns/stream_input.rb

@@ -45,7 +45,7 @@ class Yahns::StreamInput # :nodoc:
         to_read = length - @rbuf.size
         rv.replace(@rbuf.slice!(0, @rbuf.size))
         until to_read == 0 || eof? || (rv.size > 0 && @chunked)
-          @client.kgio_read(to_read, @buf) or eof!
+          @client.yahns_read(to_read, @buf) or eof!
           filter_body(@rbuf, @buf)
           rv << @rbuf
           to_read -= @rbuf.size
@@ -63,6 +63,10 @@ class Yahns::StreamInput # :nodoc:
     @client ? @client.class.client_body_buffer_size : nil
   end
 
+  def __tlsbuf
+    Thread.current[:yahns_rbuf]
+  end
+
   # :call-seq:
   #   ios.gets   => string or nil
   #
@@ -80,12 +84,13 @@ class Yahns::StreamInput # :nodoc:
     end
     re = /\A(.*?#{Regexp.escape(sep)})/
     rsize = __rsize or return
+    tlsbuf = __tlsbuf
     begin
       @rbuf.sub!(re, '') and return $1
       return @rbuf.empty? ? nil : @rbuf.slice!(0, @rbuf.size) if eof?
-      @client.kgio_read(rsize, @buf) or eof!
-      filter_body(once = '', @buf)
-      @rbuf << once
+      @client.yahns_read(rsize, @buf) or eof!
+      filter_body(tlsbuf, @buf)
+      @rbuf << tlsbuf
     end while true
   end
 
@@ -105,9 +110,10 @@ class Yahns::StreamInput # :nodoc:
   def eof?
     if @parser.body_eof?
       rsize = __rsize
+      tlsbuf = __tlsbuf
       while @chunked && ! @parser.parse
-        once = @client.kgio_read(rsize) or eof!
-        @buf << once
+        @client.yahns_read(rsize, tlsbuf) or eof!
+        @buf << tlsbuf
       end
       @client = nil
       true
@@ -126,7 +132,7 @@ class Yahns::StreamInput # :nodoc:
     dst.replace(@rbuf)
     rsize = __rsize or return
     until eof?
-      @client.kgio_read(rsize, @buf) or eof!
+      @client.yahns_read(rsize, @buf) or eof!
       filter_body(@rbuf, @buf)
       dst << @rbuf
     end

data/lib/yahns/tcp_server.rb

@@ -0,0 +1,7 @@
+# -*- encoding: binary -*-
+# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> et. al.
+# License: GPLv3 or later (see COPYING for details)
+require_relative 'acceptor'
+class Yahns::TCPServer < Kgio::TCPServer # :nodoc:
+  include Yahns::Acceptor
+end

data/lib/yahns/tmpio.rb

@@ -11,11 +11,18 @@ class Yahns::TmpIO < File # :nodoc:
   # creates and returns a new File object.  The File is unlinked
   # immediately, switched to binary mode, and userspace output
   # buffering is disabled
-  def self.new
-    fp = begin
-      super("#{Dir.tmpdir}/#{rand}", RDWR|CREAT|EXCL, 0600)
+  def self.new(tmpdir = Dir.tmpdir)
+    retried = false
+    begin
+      fp = super("#{tmpdir}/#{rand}", RDWR|CREAT|EXCL, 0600)
     rescue Errno::EEXIST
       retry
+    rescue Errno::EMFILE, Errno::ENFILE
+      raise if retried
+      retried = true
+      Thread.current[:yahns_fdmap].desperate_expire_for(nil, 5)
+      sleep(1)
+      retry
     end
     unlink(fp.path)
     fp.binmode

data/lib/yahns/unix_server.rb

@@ -0,0 +1,7 @@
+# -*- encoding: binary -*-
+# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> et. al.
+# License: GPLv3 or later (see COPYING for details)
+require_relative 'acceptor'
+class Yahns::UNIXServer < Kgio::UNIXServer # :nodoc:
+  include Yahns::Acceptor
+end

data/lib/yahns/wbuf.rb

@@ -6,14 +6,25 @@ require_relative 'wbuf_common'
 class Yahns::Wbuf # :nodoc:
   include Yahns::WbufCommon
 
-  def initialize(body, persist)
-    @tmpio = Yahns::TmpIO.new
+  def initialize(body, persist, tmpdir)
+    @tmpio = Yahns::TmpIO.new(tmpdir)
     @sf_offset = @sf_count = 0
     @wbuf_persist = persist # whether or not we keep the connection alive
     @body = body
+    @bypass = false
   end
 
   def wbuf_write(client, buf)
+    # try to bypass the VFS layer if we're all caught up
+    case rv = client.kgio_trywrite(buf)
+    when String
+      buf = rv # retry in loop
+    when nil
+      return # yay! hopefully we don't have to buffer again
+    when :wait_writable, :wait_readable
+      @bypass = false # ugh, continue to buffering to file
+    end while @bypass
+
     @sf_count += @tmpio.write(buf)
     case rv = client.trysendfile(@tmpio, @sf_offset, @sf_count)
     when Integer
@@ -25,6 +36,12 @@ class Yahns::Wbuf # :nodoc:
       raise "BUG: #{rv.nil ? "EOF" : rv.inspect} on tmpio " \
             "sf_offset=#@sf_offset sf_count=#@sf_count"
     end while @sf_count > 0
+
+    # we're all caught up, try to prevent dirty data from getting flushed
+    # to disk if we can help it.
+    @tmpio.truncate(@sf_offset = 0)
+    @tmpio.rewind
+    @bypass = true
     nil
   end
 

data/lib/yahns/wbuf_common.rb

@@ -14,8 +14,16 @@ module Yahns::WbufCommon # :nodoc:
       @sf_offset += rv # keep going otherwise
     when :wait_writable, :wait_readable
       return rv
+    when nil
+      # response got truncated, drop the connection
+      # this may happens when using Rack::File or similar, we can't
+      # keep the connection alive because we already sent our Content-Length
+      # header the client would be confused.
+      @wbuf_persist = false
+      return wbuf_close(client)
     else
-      raise "BUG: #{rv.nil? ? "EOF" : rv.inspect} on tmpio=#{@tmpio.inspect} " \
+      raise "BUG: rv=#{rv.inspect} " \
+            "on tmpio=#{@tmpio.inspect} " \
             "sf_offset=#@sf_offset sf_count=#@sf_count"
     end while true
   end
@@ -23,8 +31,7 @@ module Yahns::WbufCommon # :nodoc:
   def wbuf_close_common(client)
     @body.close if @body.respond_to?(:close)
     if @wbuf_persist.respond_to?(:call) # hijack
-      @wbuf_persist.call(client)
-      :ignore
+      client.response_hijacked(@wbuf_persist) # :ignore
     else
       @wbuf_persist # true or false or Yahns::StreamFile
     end