pitchfork 0.13.0 → 0.14.0

data/lib/pitchfork/shared_memory.rb

@@ -1,40 +1,38 @@
 # frozen_string_literal: true
 
-require 'raindrops'
-
 module Pitchfork
   module SharedMemory
     extend self
 
-    PER_DROP = Raindrops::PAGE_SIZE / Raindrops::SIZE
     CURRENT_GENERATION_OFFSET = 0
     SHUTDOWN_OFFSET = 1
     MOLD_TICK_OFFSET = 2
     MOLD_PROMOTION_TICK_OFFSET = 3
-    WORKER_TICK_OFFSET = 4
+    SERVICE_TICK_OFFSET = 4
+    WORKER_TICK_OFFSET = 5
 
-    DROPS = [Raindrops.new(PER_DROP)]
+    PAGES = [MemoryPage.new(MemoryPage::SLOTS)]
 
     def current_generation
-      DROPS[0][CURRENT_GENERATION_OFFSET]
+      PAGES[0][CURRENT_GENERATION_OFFSET]
     end
 
     def current_generation=(value)
-      DROPS[0][CURRENT_GENERATION_OFFSET] = value
+      PAGES[0][CURRENT_GENERATION_OFFSET] = value
     end
 
     def shutting_down!
-      DROPS[0][SHUTDOWN_OFFSET] = 1
+      PAGES[0][SHUTDOWN_OFFSET] = 1
     end
 
     def shutting_down?
-      DROPS[0][SHUTDOWN_OFFSET] > 0
+      PAGES[0][SHUTDOWN_OFFSET] > 0
     end
 
     class Field
       def initialize(offset)
-        @drop = DROPS.fetch(offset / PER_DROP)
-        @offset = offset % PER_DROP
+        @drop = PAGES.fetch(offset / MemoryPage::SLOTS)
+        @offset = offset % MemoryPage::SLOTS
       end
 
       def value
@@ -54,6 +52,10 @@ module Pitchfork
       self[MOLD_PROMOTION_TICK_OFFSET]
     end
 
+    def service_deadline
+      self[SERVICE_TICK_OFFSET]
+    end
+
     def worker_deadline(worker_nr)
       self[WORKER_TICK_OFFSET + worker_nr]
     end
@@ -67,9 +69,9 @@ module Pitchfork
     #
     # However this doesn't account for TTIN signals that increase the
     # number of workers, but we should probably remove that feature too.
-    def preallocate_drops(workers_count)
-      0.upto(((WORKER_TICK_OFFSET + workers_count) / PER_DROP.to_f).ceil) do |i|
-        DROPS[i] ||= Raindrops.new(PER_DROP)
+    def preallocate_pages(workers_count)
+      0.upto(((WORKER_TICK_OFFSET + workers_count) / MemoryPage::SLOTS.to_f).ceil) do |i|
+        PAGES[i] ||= MemoryPage.new(MemoryPage::SLOTS)
       end
     end
   end

data/lib/pitchfork/socket_helper.rb

@@ -72,7 +72,7 @@ module Pitchfork
         rescue => e
           logger.error("#{sock_name(sock)} " \
                        "failed to set accept_filter=#{name} (#{e.inspect})")
-          logger.error("perhaps accf_http(9) needs to be loaded".freeze)
+          logger.error("perhaps accf_http(9) needs to be loaded")
         end if arg != got
       end
     end

data/lib/pitchfork/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Pitchfork
-  VERSION = "0.13.0"
+  VERSION = "0.14.0"
   module Const
     UNICORN_VERSION = '6.1.0'
   end

data/lib/pitchfork/worker.rb

@@ -6,7 +6,7 @@ module Pitchfork
   # This class and its members can be considered a stable interface
   # and will not change in a backwards-incompatible fashion between
   # releases of pitchfork.  Knowledge of this class is generally not
-  # not needed for most users of pitchfork.
+  # needed for most users of pitchfork.
   #
   # Some users may want to access it in the after_worker_fork/after_mold_fork hooks.
   # See the Pitchfork::Configurator RDoc for examples.
@@ -24,20 +24,7 @@ module Pitchfork
       @to_io = @master = nil
       @exiting = false
       @requests_count = 0
-      if nr
-        @deadline_drop = SharedMemory.worker_deadline(nr)
-        self.deadline = 0
-      else
-        promoted!(nil)
-      end
-    end
-
-    def meminfo
-      @meminfo ||= MemInfo.new(pid) if pid
-    end
-
-    def refresh
-      meminfo&.update
+      init_deadline
     end
 
     def exiting?
@@ -94,6 +81,10 @@ module Pitchfork
       send_message_nonblock(Message::SpawnWorker.new(new_worker.nr))
     end
 
+    def spawn_service(_new_service)
+      send_message_nonblock(Message::SpawnService.new)
+    end
+
     def promote!(timeout)
       @generation += 1
       promoted!(timeout)
@@ -111,6 +102,10 @@ module Pitchfork
       @mold
     end
 
+    def service?
+      false
+    end
+
     def to_io # IO.select-compatible
       @to_io.to_io
     end
@@ -220,6 +215,15 @@ module Pitchfork
 
     private
 
+    def init_deadline
+      if nr
+        @deadline_drop = SharedMemory.worker_deadline(@nr)
+        self.deadline = 0
+      else
+        promoted!(nil)
+      end
+    end
+
     def pipe=(socket)
       raise ArgumentError, "pipe can't be nil" unless socket
       Info.keep_io(socket)
@@ -241,4 +245,28 @@ module Pitchfork
       success
     end
   end
+
+  class Service < Worker
+    def initialize(pid: nil, generation: 0)
+      super(nil, pid: pid, generation: generation)
+    end
+
+    def service?
+      true
+    end
+
+    def register_to_master(control_socket)
+      create_socketpair!
+      message = Message::ServiceSpawned.new(@pid, generation, @master)
+      control_socket.sendmsg(message)
+      @master.close
+    end
+
+    private
+
+    def init_deadline
+      @deadline_drop = SharedMemory.service_deadline
+      self.deadline = 0
+    end
+  end
 end

data/lib/pitchfork.rb

@@ -2,7 +2,6 @@
 # frozen_string_literal: true
 require 'etc'
 require 'stringio'
-require 'raindrops'
 require 'io/wait'
 
 begin
@@ -120,25 +119,6 @@ module Pitchfork
       exc.backtrace.each { |line| logger.error(line) }
     end
 
-    F_SETPIPE_SZ = 1031 if RUBY_PLATFORM =~ /linux/
-
-    def pipe # :nodoc:
-      IO.pipe.each do |io|
-        # shrink pipes to minimize impact on /proc/sys/fs/pipe-user-pages-soft
-        # limits.
-        if defined?(F_SETPIPE_SZ)
-          begin
-            io.fcntl(F_SETPIPE_SZ, Raindrops::PAGE_SIZE)
-          rescue Errno::EINVAL
-            # old kernel
-          rescue Errno::EPERM
-            # resizes fail if Linux is close to the pipe limit for the user
-            # or if the user does not have permissions to resize
-          end
-        end
-      end
-    end
-
     def socketpair
       pair = UNIXSocket.socketpair(@socket_type).map { |s| MessageSocket.new(s) }
       pair[0].close_write

data/pitchfork.gemspec

@@ -19,7 +19,6 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = ">= 2.5.0"
 
-  s.add_dependency(%q<raindrops>, '~> 0.7')
   s.add_dependency(%q<rack>, '>= 2.0')
 
   # Note: To avoid ambiguity, we intentionally avoid the SPDX-compatible

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: pitchfork
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
 platform: ruby
 authors:
 - Jean Boussier
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-04-08 00:00:00.000000000 Z
+date: 2024-05-29 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: raindrops
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.7'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -54,6 +40,7 @@ files:
 - ".gitattributes"
 - ".github/workflows/ci.yml"
 - ".gitignore"
+- ".ruby-version"
 - CHANGELOG.md
 - COPYING
 - Dockerfile
@@ -68,6 +55,7 @@ files:
 - docs/CONFIGURATION.md
 - docs/DESIGN.md
 - docs/FORK_SAFETY.md
+- docs/MIGRATING_FROM_UNICORN.md
 - docs/PHILOSOPHY.md
 - docs/REFORKING.md
 - docs/SIGNALS.md
@@ -79,6 +67,7 @@ files:
 - examples/nginx.conf
 - examples/pitchfork.conf.minimal.rb
 - examples/pitchfork.conf.rb
+- examples/pitchfork.conf.service.rb
 - examples/unicorn.socket
 - exe/pitchfork
 - ext/pitchfork_http/CFLAGS
@@ -90,11 +79,11 @@ files:
 - ext/pitchfork_http/extconf.rb
 - ext/pitchfork_http/global_variables.h
 - ext/pitchfork_http/httpdate.c
+- ext/pitchfork_http/memory_page.c
 - ext/pitchfork_http/pitchfork_http.c
 - ext/pitchfork_http/pitchfork_http.rl
 - ext/pitchfork_http/pitchfork_http_common.rl
 - lib/pitchfork.rb
-- lib/pitchfork/app/old_rails/static.rb
 - lib/pitchfork/children.rb
 - lib/pitchfork/chunked.rb
 - lib/pitchfork/configurator.rb
@@ -138,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.5
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: Rack HTTP server for fast clients and Unix

data/lib/pitchfork/app/old_rails/static.rb

@@ -1,60 +0,0 @@
-# -*- encoding: binary -*-
-# frozen_string_literal: true
-# :enddoc:
-# This code is based on the original Rails handler in Mongrel
-# Copyright (c) 2005 Zed A. Shaw
-# Copyright (c) 2009 Eric Wong
-# You can redistribute it and/or modify it under the same terms as Ruby 1.8 or
-# the GPLv3
-
-# Static file handler for Rails < 2.3.  This handler is only provided
-# as a convenience for developers.  Performance-minded deployments should
-# use nginx (or similar) for serving static files.
-#
-# This supports page caching directly and will try to resolve a
-# request in the following order:
-#
-# * If the requested exact PATH_INFO exists as a file then serve it.
-# * If it exists at PATH_INFO+rest_operator+".html" exists
-#   then serve that.
-#
-# This means that if you are using page caching it will actually work
-# with Pitchfork and you should see a decent speed boost (but not as
-# fast as if you use a static server like nginx).
-class Pitchfork::App::OldRails::Static < Struct.new(:app, :root, :file_server)
-  FILE_METHODS = { 'GET' => true, 'HEAD' => true }
-
-  # avoid allocating new strings for hash lookups
-  REQUEST_METHOD = 'REQUEST_METHOD'
-  REQUEST_URI = 'REQUEST_URI'
-  PATH_INFO = 'PATH_INFO'
-
-  def initialize(app)
-    self.app = app
-    self.root = "#{::RAILS_ROOT}/public"
-    self.file_server = ::Rack::File.new(root)
-  end
-
-  def call(env)
-    # short circuit this ASAP if serving non-file methods
-    FILE_METHODS.include?(env[REQUEST_METHOD]) or return app.call(env)
-
-    # first try the path as-is
-    path_info = env[PATH_INFO].chomp("/")
-    if File.file?("#{root}/#{::Rack::Utils.unescape(path_info)}")
-      # File exists as-is so serve it up
-      env[PATH_INFO] = path_info
-      return file_server.call(env)
-    end
-
-    # then try the cached version:
-    path_info << ActionController::Base.page_cache_extension
-
-    if File.file?("#{root}/#{::Rack::Utils.unescape(path_info)}")
-      env[PATH_INFO] = path_info
-      return file_server.call(env)
-    end
-
-    app.call(env) # call OldRails
-  end
-end if defined?(Pitchfork::App::OldRails)