pitchfork 0.16.0 → 0.18.0

data/lib/pitchfork/shared_memory.rb

@@ -44,20 +44,47 @@ module Pitchfork
       end
     end
 
-    def mold_deadline
-      self[MOLD_TICK_OFFSET]
+    class WorkerState
+      def initialize(field)
+        @field = field
+      end
+
+      def ready?
+        (@field.value & 1) == 1
+      end
+
+      def ready=(bool)
+        if bool
+          @field.value |= 1
+        else
+          @field.value &= ~1
+        end
+      end
+
+      def deadline=(value)
+        # Shift the value up and preserve the current ready bit.
+        @field.value = (value << 1) | (@field.value & 1)
+      end
+
+      def deadline
+        @field.value >> 1
+      end
+    end
+
+    def mold_state
+      WorkerState.new(self[MOLD_TICK_OFFSET])
     end
 
-    def mold_promotion_deadline
-      self[MOLD_PROMOTION_TICK_OFFSET]
+    def mold_promotion_state
+      WorkerState.new(self[MOLD_PROMOTION_TICK_OFFSET])
     end
 
-    def service_deadline
-      self[SERVICE_TICK_OFFSET]
+    def service_state
+      WorkerState.new(self[SERVICE_TICK_OFFSET])
     end
 
-    def worker_deadline(worker_nr)
-      self[WORKER_TICK_OFFSET + worker_nr]
+    def worker_state(worker_nr)
+      WorkerState.new(self[WORKER_TICK_OFFSET + worker_nr])
     end
 
     def [](offset)
@@ -75,4 +102,4 @@ module Pitchfork
       end
     end
   end
-end
+end

data/lib/pitchfork/version.rb

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

data/lib/pitchfork/worker.rb

@@ -14,17 +14,17 @@ module Pitchfork
     # :stopdoc:
     EXIT_SIGNALS = [:QUIT, :TERM]
     attr_accessor :nr, :pid, :generation
-    attr_reader :master, :requests_count
+    attr_reader :monitor, :requests_count
 
     def initialize(nr, pid: nil, generation: 0)
       @nr = nr
       @pid = pid
       @generation = generation
       @mold = false
-      @to_io = @master = nil
+      @to_io = @monitor = nil
       @exiting = false
       @requests_count = 0
-      init_deadline
+      init_state
     end
 
     def exiting?
@@ -32,7 +32,7 @@ module Pitchfork
     end
 
     def pending?
-      @master.nil?
+      @monitor.nil?
     end
 
     def outdated?
@@ -46,31 +46,44 @@ module Pitchfork
 
       case message
       when Message::MoldSpawned
-        @deadline_drop = SharedMemory.mold_promotion_deadline
+        @state_drop = SharedMemory.mold_promotion_state
       when Message::MoldReady
-        @deadline_drop = SharedMemory.mold_deadline
+        @state_drop = SharedMemory.mold_state
       end
     end
 
-    def register_to_master(control_socket)
+    def register_to_monitor(control_socket)
       create_socketpair!
-      message = Message::WorkerSpawned.new(@nr, @pid, generation, @master)
+      message = Message::WorkerSpawned.new(@nr, @pid, generation, @monitor)
       control_socket.sendmsg(message)
-      @master.close
+      @monitor.close
     end
 
     def start_promotion(control_socket)
       create_socketpair!
-      message = Message::MoldSpawned.new(@nr, @pid, generation, @master)
+      message = Message::MoldSpawned.new(@nr, @pid, generation, @monitor)
       control_socket.sendmsg(message)
-      @master.close
+      @monitor.close
     end
 
     def finish_promotion(control_socket)
+      SharedMemory.current_generation = @generation
       message = Message::MoldReady.new(@nr, @pid, generation)
       control_socket.sendmsg(message)
-      SharedMemory.current_generation = @generation
-      @deadline_drop = SharedMemory.mold_deadline
+      @state_drop = SharedMemory.mold_state
+    end
+
+    def notify_ready(control_socket)
+      self.ready = true
+      message = if worker?
+        Message::WorkerReady.new(@nr, @pid, @generation)
+      elsif service?
+        Message::ServiceReady.new(@pid, @generation)
+      else
+        raise "Unexpected child type"
+      end
+
+      control_socket.sendmsg(message)
     end
 
     def promote(generation)
@@ -93,7 +106,7 @@ module Pitchfork
     def promoted!(timeout)
       @mold = true
       @nr = nil
-      @deadline_drop = SharedMemory.mold_promotion_deadline
+      @state_drop = SharedMemory.mold_promotion_state
       update_deadline(timeout) if timeout
       self
     end
@@ -106,12 +119,16 @@ module Pitchfork
       false
     end
 
+    def worker?
+      !mold? && !service?
+    end
+
     def to_io # IO.select-compatible
       @to_io.to_io
     end
 
-    def master=(socket)
-      @master = MessageSocket.new(socket)
+    def monitor=(socket)
+      @monitor = MessageSocket.new(socket)
     end
 
     # call a signal handler immediately without triggering EINTR
@@ -126,7 +143,7 @@ module Pitchfork
       trap(sig, old_cb)
     end
 
-    # master sends fake signals to children
+    # monitor sends fake signals to children
     def soft_kill(sig) # :nodoc:
       signum = Signal.list[sig.to_s] or raise ArgumentError, "BUG: bad signal: #{sig.inspect}"
 
@@ -149,7 +166,7 @@ module Pitchfork
         case buf = @to_io.recvmsg_nonblock(exception: false)
         when :wait_readable # keep waiting
           return false
-        when nil # EOF master died, but we are at a safe place to exit
+        when nil # EOF monitor died, but we are at a safe place to exit
           fake_sig(:QUIT)
           return false
         when Message::SoftKill
@@ -171,18 +188,29 @@ module Pitchfork
       super || (!@nr.nil? && @nr == other)
     end
 
+    def ready?
+      @state_drop.ready?
+    end
+
+    def ready=(bool)
+      @state_drop.ready = bool
+    end
+
     def update_deadline(timeout)
       self.deadline = Pitchfork.time_now(true) + timeout
     end
 
     # called in the worker process
     def deadline=(value) # :nodoc:
-      @deadline_drop.value = value
+      # If we are (re)setting to zero mark worker as not ready.
+      self.ready = false if value == 0
+
+      @state_drop.deadline = value
     end
 
-    # called in the master process
+    # called in the monitor process
     def deadline # :nodoc:
-      @deadline_drop.value
+      @state_drop.deadline
     end
 
     def reset
@@ -193,26 +221,34 @@ module Pitchfork
       @requests_count += by
     end
 
-    # called in both the master (reaping worker) and worker (SIGQUIT handler)
+    # called in both the monitor (reaping worker) and worker (SIGQUIT handler)
     def close # :nodoc:
       self.deadline = 0
-      @master.close if @master
+      @monitor.close if @monitor
       @to_io.close if @to_io
     end
 
     def create_socketpair!
-      @to_io, @master = Info.keep_ios(Pitchfork.socketpair)
+      @to_io, @monitor = Info.keep_ios(Pitchfork.socketpair)
     end
 
     def after_fork_in_child
-      @master&.close
+      @monitor&.close
+    end
+
+    def to_log
+      if mold?
+        pid ? "mold gen=#{generation} pid=#{pid}" : "mold gen=#{generation}"
+      else
+        pid ? "worker=#{nr} gen=#{generation} pid=#{pid}" : "worker=#{nr} gen=#{generation}"
+      end
     end
 
     private
 
-    def init_deadline
+    def init_state
       if nr
-        @deadline_drop = SharedMemory.worker_deadline(@nr)
+        @state_drop = SharedMemory.worker_state(@nr)
         self.deadline = 0
       else
         promoted!(nil)
@@ -222,14 +258,14 @@ module Pitchfork
     def pipe=(socket)
       raise ArgumentError, "pipe can't be nil" unless socket
       Info.keep_io(socket)
-      @master = MessageSocket.new(socket)
+      @monitor = MessageSocket.new(socket)
     end
 
     def send_message_nonblock(message)
       success = false
-      return false unless @master
+      return false unless @monitor
       begin
-        case @master.sendmsg_nonblock(message, exception: false)
+        case @monitor.sendmsg_nonblock(message, exception: false)
         when :wait_writable
         else
           success = true
@@ -250,17 +286,21 @@ module Pitchfork
       true
     end
 
-    def register_to_master(control_socket)
+    def register_to_monitor(control_socket)
       create_socketpair!
-      message = Message::ServiceSpawned.new(@pid, generation, @master)
+      message = Message::ServiceSpawned.new(@pid, generation, @monitor)
       control_socket.sendmsg(message)
-      @master.close
+      @monitor.close
+    end
+
+    def to_log
+      pid ? "service gen=#{generation} pid=#{pid}" : "service gen=#{generation}"
     end
 
     private
 
-    def init_deadline
-      @deadline_drop = SharedMemory.service_deadline
+    def init_state
+      @state_drop = SharedMemory.service_state
       self.deadline = 0
     end
   end

data/lib/pitchfork.rb

@@ -87,7 +87,12 @@ module Pitchfork
         when /\.ru$/
           raw = File.read(ru)
           raw.sub!(/^__END__\n.*/, '')
-          eval("Rack::Builder.new {(\n#{raw}\n)}.to_app", TOPLEVEL_BINDING, ru)
+          lines = raw.lines
+          trailing_comments_index = lines.index { |line| !line.start_with?('#') }
+          prelude = lines[0...trailing_comments_index].join
+          raw = lines[trailing_comments_index..-1].join
+
+          eval("#{prelude}\nRack::Builder.new do\n#{raw}\nend.to_app\n", TOPLEVEL_BINDING, ru)
         else
           require ru
           Object.const_get(File.basename(ru, '.rb').capitalize)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pitchfork
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.18.0
 platform: ruby
 authors:
 - Jean Boussier
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-07-26 00:00:00.000000000 Z
+date: 2025-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -141,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: Rack HTTP server for fast clients and Unix