pitchfork 0.1.2 → 0.2.0

data/lib/pitchfork/worker.rb

@@ -7,14 +7,13 @@ 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 before_fork/after_fork hooks.
+  # Some users may want to access it in the after_promotion/after_fork hooks.
   # See the Pitchfork::Configurator RDoc for examples.
   class Worker
     # :stopdoc:
     EXIT_SIGNALS = [:QUIT, :TERM]
-    @generation = 0
     attr_accessor :nr, :pid, :generation
-    attr_reader :master
+    attr_reader :master, :requests_count
 
     def initialize(nr, pid: nil, generation: 0)
       @nr = nr
@@ -23,6 +22,7 @@ module Pitchfork
       @mold = false
       @to_io = @master = nil
       @exiting = false
+      @requests_count = 0
       if nr
         build_raindrops(nr)
       else
@@ -42,13 +42,17 @@ module Pitchfork
       @exiting
     end
 
+    def outdated?
+      CURRENT_GENERATION_DROP[0] > @generation
+    end
+
     def update(message)
       message.class.members.each do |member|
         send("#{member}=", message.public_send(member))
       end
 
       case message
-      when Message::WorkerPromoted, Message::PromoteWorker
+      when Message::WorkerPromoted
         promoted!
       end
     end
@@ -60,9 +64,10 @@ module Pitchfork
       @master.close
     end
 
-    def acknowlege_promotion(control_socket)
+    def declare_promotion(control_socket)
       message = Message::WorkerPromoted.new(@nr, Process.pid, generation)
       control_socket.sendmsg(message)
+      CURRENT_GENERATION_DROP[0] = @generation
     end
 
     def promote(generation)
@@ -73,11 +78,17 @@ module Pitchfork
       send_message_nonblock(Message::SpawnWorker.new(new_worker.nr))
     end
 
+    def promote!
+      @generation += 1
+      promoted!
+    end
+
     def promoted!
       @mold = true
       @nr = nil
       @drop_offset = 0
       @tick_drop = MOLD_DROP
+      self
     end
 
     def mold?
@@ -169,15 +180,11 @@ module Pitchfork
     end
 
     def reset
-      @requests_drop[@drop_offset] = 0
-    end
-
-    def requests_count
-      @requests_drop[@drop_offset]
+      @requests_count = 0
     end
 
-    def increment_requests_count
-      @requests_drop.incr(@drop_offset)
+    def increment_requests_count(by = 1)
+      @requests_count += by
     end
 
     # called in both the master (reaping worker) and worker (SIGQUIT handler)
@@ -215,9 +222,9 @@ module Pitchfork
     end
 
     MOLD_DROP = Raindrops.new(1)
+    CURRENT_GENERATION_DROP = Raindrops.new(1)
     PER_DROP = Raindrops::PAGE_SIZE / Raindrops::SIZE
     TICK_DROPS = []
-    REQUEST_DROPS = []
 
     class << self
       # Since workers are created from another process, we have to
@@ -228,7 +235,6 @@ module Pitchfork
       def preallocate_drops(workers_count)
         0.upto(workers_count / PER_DROP) do |i|
           TICK_DROPS[i] = Raindrops.new(PER_DROP)
-          REQUEST_DROPS[i] = Raindrops.new(PER_DROP)
         end
       end
     end
@@ -237,8 +243,7 @@ module Pitchfork
       drop_index = drop_nr / PER_DROP
       @drop_offset = drop_nr % PER_DROP
       @tick_drop = TICK_DROPS[drop_index] ||= Raindrops.new(PER_DROP)
-      @requests_drop = REQUEST_DROPS[drop_index] ||= Raindrops.new(PER_DROP)
-      @tick_drop[@drop_offset] = @requests_drop[@drop_offset] = 0
+      @tick_drop[@drop_offset] = 0
     end
   end
 end

data/lib/pitchfork.rb

@@ -57,40 +57,15 @@ module Pitchfork
         Object.const_get(File.basename(ru, '.rb').capitalize)
       end
 
-      if $DEBUG
-        require 'pp'
-        pp({ :inner_app => inner_app })
-      end
-
-      return inner_app unless server.default_middleware
-
-      middleware = { # order matters
-        ContentLength: nil,
-        Chunked: nil,
-        CommonLogger: [ $stderr ],
-        ShowExceptions: nil,
-        Lint: nil,
-        TempfileReaper: nil,
-      }
-
-      # return value, matches rackup defaults based on env
-      # Pitchfork does not support persistent connections, but Rainbows!
-      # and Zbatery both do.  Users accustomed to the Rack::Server default
-      # middlewares will need ContentLength/Chunked middlewares.
       case ENV["RACK_ENV"]
       when "development"
-      when "deployment"
-        middleware.delete(:ShowExceptions)
-        middleware.delete(:Lint)
+        Rack::Builder.new do
+          use(Rack::Lint)
+          run inner_app
+        end.to_app
       else
-        return inner_app
+        inner_app
       end
-      Rack::Builder.new do
-        middleware.each do |m, args|
-          use(Rack.const_get(m), *args) if Rack.const_defined?(m)
-        end
-        run inner_app
-      end.to_app
     end
   end
 
@@ -146,13 +121,32 @@ module Pitchfork
       raise
     end
   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))
+      end
+
+      fork(&block)
+    end.value
+  end
   # :startdoc:
 end
 # :enddoc:
 
 %w(
   const socket_helper stream_input tee_input mem_info children message http_parser
-  refork_condition mold_selector configurator tmpio http_response worker http_server
+  refork_condition configurator tmpio http_response worker http_server
 ).each do |s|
   require_relative "pitchfork/#{s}"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pitchfork
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Jean Boussier
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-01-30 00:00:00.000000000 Z
+date: 2023-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: raindrops
@@ -96,13 +96,13 @@ files:
 - lib/pitchfork/children.rb
 - lib/pitchfork/configurator.rb
 - lib/pitchfork/const.rb
+- lib/pitchfork/flock.rb
 - lib/pitchfork/http_parser.rb
 - lib/pitchfork/http_response.rb
 - lib/pitchfork/http_server.rb
 - lib/pitchfork/launcher.rb
 - lib/pitchfork/mem_info.rb
 - lib/pitchfork/message.rb
-- lib/pitchfork/mold_selector.rb
 - lib/pitchfork/preread_input.rb
 - lib/pitchfork/refork_condition.rb
 - lib/pitchfork/select_waiter.rb
@@ -133,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.6
 signing_key:
 specification_version: 4
 summary: Rack HTTP server for fast clients and Unix

data/lib/pitchfork/mold_selector.rb

@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-module Pitchfork
-  module MoldSelector
-    class LeastSharedMemory
-      def call(server)
-        workers = server.children.fresh_workers
-        if workers.empty?
-          server.logger.info("No current generation workers yet")
-          return
-        end
-        candidate = workers.shift
-
-        workers.each do |worker|
-          if worker.meminfo.shared_memory < candidate.meminfo.shared_memory
-            # We suppose that a worker with a lower amount of shared memory
-            # has warmed up more caches & such, hence is closer to stabilize
-            # making it a better candidate.
-            candidate = worker
-          end
-        end
-        parent_meminfo = server.children.mold&.meminfo || MemInfo.new(Process.pid)
-        cow_efficiency = candidate.meminfo.cow_efficiency(parent_meminfo)
-        server.logger.info("worker=#{candidate.nr} pid=#{candidate.pid} selected as new mold shared_memory_kb=#{candidate.meminfo.shared_memory} cow=#{cow_efficiency.round(1)}%")
-        candidate
-      end
-    end
-  end
-end