pitchfork 0.12.0 → 0.14.0

data/ext/pitchfork_http/pitchfork_http.rl

@@ -16,6 +16,7 @@
 #include "child_subreaper.h"
 
 void init_pitchfork_httpdate(void);
+void init_pitchfork_memory_page(VALUE);
 
 #define UH_FL_CHUNKED  0x1
 #define UH_FL_HASBODY  0x2
@@ -960,7 +961,7 @@ static VALUE HttpParser_rssget(VALUE self)
   assert(!NIL_P(var) && "missed global field"); \
 } while (0)
 
-void Init_pitchfork_http(void)
+RUBY_FUNC_EXPORTED void Init_pitchfork_http(void)
 {
   VALUE mPitchfork;
 
@@ -1024,5 +1025,6 @@ void Init_pitchfork_http(void)
 
   init_epollexclusive(mPitchfork);
   init_child_subreaper(mPitchfork);
+  init_pitchfork_memory_page(mPitchfork);
 }
 #undef SET_GLOBAL

data/lib/pitchfork/children.rb

@@ -1,31 +1,35 @@
 # -*- encoding: binary -*-
+# frozen_string_literal: true
 
 module Pitchfork
   # This class keep tracks of the state of all the master children.
   class Children
-    attr_reader :mold
+    attr_reader :mold, :service
     attr_accessor :last_generation
 
     def initialize
       @last_generation = 0
-      @children = {} # All children, including molds, indexed by PID.
+      @children = {} # All children, including molds and services, indexed by PID.
       @workers = {} # Workers indexed by their `nr`.
       @molds = {} # Molds, index by PID.
       @mold = nil # The latest mold, if any.
+      @service = nil
       @pending_workers = {} # Pending workers indexed by their `nr`.
       @pending_molds = {} # Worker promoted to mold, not yet acknowledged
     end
 
-    def refresh
-      @workers.each_value(&:refresh)
-      @molds.each_value(&:refresh)
-    end
-
     def register(child)
       # Children always start as workers, never molds, so we know they have a `#nr`.
+      unless child.nr
+        raise "[BUG] Trying to register a child without an `nr`: #{child.inspect}"
+      end
       @pending_workers[child.nr] = @workers[child.nr] = child
     end
 
+    def register_service(service)
+      @service = service
+    end
+
     def register_mold(mold)
       @pending_molds[mold.pid] = mold
       @children[mold.pid] = mold
@@ -43,6 +47,11 @@ module Pitchfork
         @pending_molds[mold.pid] = mold
         @children[mold.pid] = mold
         return mold
+      when Message::ServiceSpawned
+        service = @service
+        service.update(message)
+        @children[service.pid] = service
+        return service
       end
 
       child = @children[message.pid] || (message.nr && @workers[message.nr])
@@ -77,12 +86,17 @@ module Pitchfork
         @pending_molds.delete(child.pid)
         @molds.delete(child.pid)
         @workers.delete(child.nr)
+
         if @mold == child
           @pending_workers.reject! do |nr, worker|
             worker.generation == @mold.generation
           end
           @mold = nil
         end
+
+        if @service == child
+          @service = nil
+        end
       end
       child
     end
@@ -153,13 +167,5 @@ module Pitchfork
     def workers_count
       @workers.size
     end
-
-    def total_pss
-      total_pss = MemInfo.new(Process.pid).pss
-      @children.each do |_, worker|
-        total_pss += worker.meminfo.pss if worker.meminfo
-      end
-      total_pss
-    end
   end
 end

data/lib/pitchfork/configurator.rb

@@ -1,4 +1,5 @@
 # -*- encoding: binary -*-
+# frozen_string_literal: true
 require 'logger'
 
 module Pitchfork
@@ -51,6 +52,8 @@ module Pitchfork
           "repead unknown process (#{status.inspect})"
         elsif worker.mold?
           "mold pid=#{worker.pid rescue 'unknown'} gen=#{worker.generation rescue 'unknown'} reaped (#{status.inspect})"
+        elsif worker.service?
+          "service pid=#{worker.pid rescue 'unknown'} gen=#{worker.generation rescue 'unknown'} reaped (#{status.inspect})"
         else
           "worker=#{worker.nr rescue 'unknown'} pid=#{worker.pid rescue 'unknown'} gen=#{worker.generation rescue 'unknown'} reaped (#{status.inspect})"
         end
@@ -74,6 +77,8 @@ module Pitchfork
       :check_client_connection => false,
       :rewindable_input => true,
       :client_body_buffer_size => Pitchfork::Const::MAX_BODY,
+      :before_service_worker_ready => nil,
+      :before_service_worker_exit => nil,
     }
     #:startdoc:
 
@@ -175,6 +180,14 @@ module Pitchfork
       set_hook(:after_request_complete, block_given? ? block : args[0], 3)
     end
 
+    def before_service_worker_ready(&block)
+      set_hook(:before_service_worker_ready, block, 2)
+    end
+
+    def before_service_worker_exit(&block)
+      set_hook(:before_service_worker_exit, block, 2)
+    end
+
     def timeout(seconds, cleanup: 2)
       soft_timeout = set_int(:soft_timeout, seconds, 3)
       cleanup_timeout = set_int(:cleanup_timeout, cleanup, 2)

data/lib/pitchfork/const.rb

@@ -1,4 +1,5 @@
 # -*- encoding: binary -*-
+# frozen_string_literal: true
 
 module Pitchfork
   module Const # :nodoc:

data/lib/pitchfork/flock.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'tempfile'
 
 module Pitchfork

data/lib/pitchfork/http_parser.rb

@@ -1,4 +1,5 @@
 # -*- encoding: binary -*-
+# frozen_string_literal: true
 # :enddoc:
 # no stable API here
 
@@ -19,14 +20,13 @@ module Pitchfork
       "SERVER_SOFTWARE" => "Pitchfork #{Pitchfork::Const::UNICORN_VERSION}"
     }
 
-    NULL_IO = StringIO.new("")
+    NULL_IO = StringIO.new.binmode
 
     # :stopdoc:
-    HTTP_RESPONSE_START = [ 'HTTP'.freeze, '/1.1 '.freeze ]
+    HTTP_RESPONSE_START = [ 'HTTP', '/1.1 ' ]
     EMPTY_ARRAY = [].freeze
     @@input_class = Pitchfork::TeeInput
     @@check_client_connection = false
-    @@tcpi_inspect_ok = Socket.const_defined?(:TCP_INFO)
 
     def self.input_class
       @@input_class
@@ -104,83 +104,29 @@ module Pitchfork
     end
 
     def hijacked?
-      env.include?('rack.hijack_io'.freeze)
+      env.include?('rack.hijack_io')
     end
 
-    if Raindrops.const_defined?(:TCP_Info)
-      TCPI = Raindrops::TCP_Info.allocate
-
+    if Socket.const_defined?(:TCP_INFO) # Linux
       def check_client_connection(socket) # :nodoc:
         if TCPSocket === socket
-          # Raindrops::TCP_Info#get!, #state (reads struct tcp_info#tcpi_state)
-          raise Errno::EPIPE, "client closed connection".freeze,
-                EMPTY_ARRAY if closed_state?(TCPI.get!(socket).state)
-        else
-          write_http_header(socket)
-        end
-      end
-
-      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
+          begin
+            tcp_info = socket.getsockopt(Socket::IPPROTO_TCP, Socket::TCP_INFO)
+          rescue IOError, SystemCallError
+            return write_http_header(socket)
           end
-        end
-      end
-    else
 
-      # Ruby 2.2+ can show struct tcp_info as a string Socket::Option#inspect.
-      # Not that efficient, but probably still better than doing unnecessary
-      # work after a client gives up.
-      def check_client_connection(socket) # :nodoc:
-        if TCPSocket === socket && @@tcpi_inspect_ok
-          opt = socket.getsockopt(Socket::IPPROTO_TCP, Socket::TCP_INFO).inspect
-          if opt =~ /\bstate=(\S+)/
-            raise Errno::EPIPE, "client closed connection".freeze,
-                  EMPTY_ARRAY if closed_state_str?($1)
-          else
-            @@tcpi_inspect_ok = false
-            write_http_header(socket)
+          case tcp_info.data.unpack1("C")
+          when 6, 7, 8, 9, 11 # TIME_WAIT, CLOSE, CLOSE_WAIT, LAST_ACK, CLOSING
+            raise Errno::EPIPE, "client closed connection", EMPTY_ARRAY
           end
-          opt.clear
         else
           write_http_header(socket)
         end
       end
-
-      def closed_state_str?(state)
-        case state
-        when 'ESTABLISHED'
-          false
-        # not a typo, ruby maps TCP_CLOSE (no 'D') to state=CLOSED (w/ 'D')
-        when 'CLOSE_WAIT', 'TIME_WAIT', 'CLOSED', 'LAST_ACK', 'CLOSING'
-          true
-        else
-          false
-        end
+    else
+      def check_client_connection(socket) # :nodoc:
+        write_http_header(socket)
       end
     end
 
@@ -199,11 +145,11 @@ module Pitchfork
         val.downcase!
       end
 
-      if vals.pop == 'chunked'.freeze
-        return true unless vals.include?('chunked'.freeze)
+      if vals.pop == 'chunked'
+        return true unless vals.include?('chunked')
         raise Pitchfork::HttpParserError, 'double chunked', []
       end
-      return false unless vals.include?('chunked'.freeze)
+      return false unless vals.include?('chunked')
       raise Pitchfork::HttpParserError, 'chunked not last', []
     end
   end

data/lib/pitchfork/http_response.rb

@@ -1,4 +1,5 @@
 # -*- encoding: binary -*-
+# frozen_string_literal: true
 # :enddoc:
 
 module Pitchfork
@@ -48,10 +49,10 @@ module Pitchfork
       if headers
         code = status.to_i
         msg = STATUS_CODES[code]
-        start = req.response_start_sent ? ''.freeze : 'HTTP/1.1 '.freeze
+        start = req.response_start_sent ? '' : 'HTTP/1.1 '
         buf = "#{start}#{msg ? %Q(#{code} #{msg}) : status}\r\n" \
               "Date: #{httpdate}\r\n" \
-              "Connection: close\r\n"
+              "Connection: close\r\n".b
         headers.each do |key, value|
           case key
           when %r{\A(?:Date|Connection)\z}i
@@ -64,7 +65,7 @@ module Pitchfork
             append_header(buf, key, value)
           end
         end
-        socket.write(buf << "\r\n".freeze)
+        socket.write(buf << "\r\n")
       end
 
       if hijack