pitchfork 0.2.0 → 0.3.0

data/lib/pitchfork/worker.rb

@@ -7,7 +7,7 @@ module Pitchfork
   # releases of pitchfork.  Knowledge of this class is generally not
   # not needed for most users of pitchfork.
   #
-  # Some users may want to access it in the after_promotion/after_fork hooks.
+  # Some users may want to access it in the after_worker_fork/after_mold_fork hooks.
   # See the Pitchfork::Configurator RDoc for examples.
   class Worker
     # :stopdoc:
@@ -42,6 +42,10 @@ module Pitchfork
       @exiting
     end
 
+    def pending?
+      @master.nil?
+    end
+
     def outdated?
       CURRENT_GENERATION_DROP[0] > @generation
     end
@@ -50,22 +54,24 @@ module Pitchfork
       message.class.members.each do |member|
         send("#{member}=", message.public_send(member))
       end
-
-      case message
-      when Message::WorkerPromoted
-        promoted!
-      end
     end
 
     def register_to_master(control_socket)
       create_socketpair!
-      message = Message::WorkerSpawned.new(@nr, Process.pid, generation, @master)
+      message = Message::WorkerSpawned.new(@nr, @pid, generation, @master)
       control_socket.sendmsg(message)
       @master.close
     end
 
-    def declare_promotion(control_socket)
-      message = Message::WorkerPromoted.new(@nr, Process.pid, generation)
+    def start_promotion(control_socket)
+      create_socketpair!
+      message = Message::MoldSpawned.new(@nr, @pid, generation, @master)
+      control_socket.sendmsg(message)
+      @master.close
+    end
+
+    def finish_promotion(control_socket)
+      message = Message::MoldReady.new(@nr, @pid, generation)
       control_socket.sendmsg(message)
       CURRENT_GENERATION_DROP[0] = @generation
     end
@@ -198,7 +204,7 @@ module Pitchfork
     end
 
     def after_fork_in_child
-      @master.close
+      @master&.close
     end
 
     private
@@ -215,7 +221,7 @@ module Pitchfork
         else
           success = true
         end
-      rescue Errno::EPIPE
+      rescue Errno::EPIPE, Errno::ECONNRESET
         # worker will be reaped soon
       end
       success

data/lib/pitchfork.rb

@@ -57,15 +57,13 @@ module Pitchfork
         Object.const_get(File.basename(ru, '.rb').capitalize)
       end
 
-      case ENV["RACK_ENV"]
-      when "development"
-        Rack::Builder.new do
-          use(Rack::Lint)
-          run inner_app
-        end.to_app
-      else
-        inner_app
-      end
+      Rack::Builder.new do
+        use(Rack::ContentLength)
+        use(Pitchfork::Chunked)
+        use(Rack::Lint) if ENV["RACK_ENV"] == "development"
+        use(Rack::TempfileReaper)
+        run inner_app
+      end.to_app
     end
   end
 
@@ -136,17 +134,53 @@ module Pitchfork
       parent_thread.thread_variables.each do |variable|
         current_thread.thread_variable_set(variable, parent_thread.thread_variable_get(variable))
       end
-
-      fork(&block)
+      Process.fork(&block)
     end.value
   end
+
+  def self.fork_sibling(&block)
+    if REFORKING_AVAILABLE
+      # We double fork so that the new worker is re-attached back
+      # to the master.
+      # This requires either PR_SET_CHILD_SUBREAPER which is exclusive to Linux 3.4
+      # or the master to be PID 1.
+      if middle_pid = Process.fork # parent
+        # We need to wait(2) so that the middle process doesn't end up a zombie.
+        Process.wait(middle_pid)
+      else # first child
+        clean_fork(&block) # detach into a grand child
+        exit
+      end
+    else
+      clean_fork(&block)
+    end
+
+    nil # it's tricky to return the PID
+  end
+
+  def self.time_now(int = false)
+    Process.clock_gettime(Process::CLOCK_MONOTONIC, int ? :second : :float_second)
+  end
   # :startdoc:
 end
 # :enddoc:
 
-%w(
-  const socket_helper stream_input tee_input mem_info children message http_parser
-  refork_condition configurator tmpio http_response worker http_server
-).each do |s|
-  require_relative "pitchfork/#{s}"
-end
+require 'pitchfork/pitchfork_http'
+
+Pitchfork::REFORKING_AVAILABLE = Pitchfork::CHILD_SUBREAPER_AVAILABLE || Process.pid == 1
+
+require_relative "pitchfork/const"
+require_relative "pitchfork/socket_helper"
+require_relative "pitchfork/stream_input"
+require_relative "pitchfork/tee_input"
+require_relative "pitchfork/mem_info"
+require_relative "pitchfork/children"
+require_relative "pitchfork/message"
+require_relative "pitchfork/chunked"
+require_relative "pitchfork/http_parser"
+require_relative "pitchfork/refork_condition"
+require_relative "pitchfork/configurator"
+require_relative "pitchfork/tmpio"
+require_relative "pitchfork/http_response"
+require_relative "pitchfork/worker"
+require_relative "pitchfork/http_server"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pitchfork
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Jean Boussier
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-04-04 00:00:00.000000000 Z
+date: 2023-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: raindrops
@@ -94,6 +94,7 @@ files:
 - lib/pitchfork.rb
 - lib/pitchfork/app/old_rails/static.rb
 - lib/pitchfork/children.rb
+- lib/pitchfork/chunked.rb
 - lib/pitchfork/configurator.rb
 - lib/pitchfork/const.rb
 - lib/pitchfork/flock.rb
@@ -133,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Rack HTTP server for fast clients and Unix