pitchfork 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e42e6177d834ad380a59378ccea33b4110b443975d913ca6bc66c84ee5abbdb
-  data.tar.gz: 79ae3e1c674b3fa6b6bd78103d177d6593e8ce9239f4603450f300ad5685a827
+  metadata.gz: f37584c7333941059ab10086a74d1102b1969c2fefb7a759fc13f9e4f837891e
+  data.tar.gz: bc69759f0a53d98d81648ee60b833e6c49fd3f88d53f7ac319e9acff845c7cf1
 SHA512:
-  metadata.gz: 1ff1761d7107bf62e2e7f31c7b1843ffe78eb99d650a8175ef0f9173f871499afb69b13407e9c70d80be4afd799a2c18243942318b92d5bd339bbbf591abb32b
-  data.tar.gz: 7c49a7909dfd4d3405f66859a308700dd047aa360412a752831348a000ecd4be58d493856539e46b56825e74a7fd19ae81731344bef0a1cde16e3529134c94eb
+  metadata.gz: 69d796bf414bb4bf7b7867e61229fa12764ca12dd1aaf2b36a615c2b806a64aa665b4c1483147e6d39a4d49df340ad31406f0db294da52e9a8a5740b186233a9
+  data.tar.gz: 51dc5852d5bc26fbba0f1824beb76977653ae089d589e33a1d7defca89b9b2235f466c5fc59419f56d0944b6c5ee819e1f966e9c32eac3d79029d951a6071c38

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Unreleased
 
+# 0.4.0
+
+- Preserve the current thread when reforking.
+
 # 0.3.0
 
 - Renamed `after_promotion` in `after_mold_fork`.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pitchfork (0.3.0)
+    pitchfork (0.4.0)
       rack (>= 2.0)
       raindrops (~> 0.7)
 

data/lib/pitchfork/http_server.rb

@@ -606,7 +606,10 @@ module Pitchfork
       end
 
       unless client.closed? # rack.hijack may've close this for us
-        client.shutdown # in case of fork() in Rack app
+        begin
+          client.shutdown # in case of fork() in Rack app
+        rescue Errno::ENOTCONN
+        end
         client.close # flush and uncork socket immediately, no keepalive
       end
     rescue => e
@@ -730,10 +733,15 @@ module Pitchfork
           mold.start_promotion(@control_socket[1])
           mold_loop(mold)
         end
-        true
-      ensure
+      rescue
+        # HACK: we need to call this on error or on no error, but not on throw
+        # hence why we don't use `ensure`
+        @promotion_lock.at_fork
+        raise
+      else
         @promotion_lock.at_fork # We let the spawned mold own the lock
       end
+      true
     end
 
     def mold_loop(mold)

data/lib/pitchfork/version.rb

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

data/lib/pitchfork.rb

@@ -121,21 +121,42 @@ module Pitchfork
   end
 
   def self.clean_fork(&block)
-    # We fork from a thread to start with a clean stack.
-    # If we didn't the base stack would grow after each refork
-    # putting an effective limit on the number of generations.
-    parent_thread = Thread.current
-    Thread.new do
-      current_thread = Thread.current
-      # We copy over any thread state it might have
-      parent_thread.keys.each do |key|
-        current_thread[key] = parent_thread[key]
-      end
-      parent_thread.thread_variables.each do |variable|
-        current_thread.thread_variable_set(variable, parent_thread.thread_variable_get(variable))
+    if pid = Process.fork
+      return pid
+    end
+
+    begin
+      # Pitchfork recursively refork the worker processes.
+      # Because of this we need to unwind the stack before resuming execution
+      # in the child, otherwise on each generation the available stack space would
+      # get smaller and smaller until it's basically 0.
+      #
+      # The very first version of this method used to call fork from a new
+      # thread, however this can cause issues with some native gems that rely on
+      # pthread_atfork(3) or pthread_mutex_lock(3), as the new main thread would
+      # now be different.
+      #
+      # A second version used to fork from a new fiber, but fibers have a much smaller
+      # stack space (https://bugs.ruby-lang.org/issues/3187), so it would break large applications.
+      #
+      # The latest version now use `throw` to unwind the stack after the fork, it however
+      # restrict it to be called only inside `handle_clean_fork`.
+      if Thread.current[:pitchfork_handle_clean_fork]
+        throw self, block
+      else
+        while block
+          block = catch(self) do
+            Thread.current[:pitchfork_handle_clean_fork] = true
+            block.call
+            nil
+          end
+        end
       end
-      Process.fork(&block)
-    end.value
+    rescue
+      abort
+    else
+      exit
+    end
   end
 
   def self.fork_sibling(&block)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pitchfork
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Jean Boussier
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-24 00:00:00.000000000 Z
+date: 2023-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: raindrops