forkr 0.1.7 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0539b882a7e449399d84d53b5f84514db12af81
-  data.tar.gz: 41f718fe40fb072bd4c5e6f0e28953ac97f0d917
+  metadata.gz: 3def66e8f139ed116bb7beaf96207eea08e0dab7
+  data.tar.gz: 9f34069eaafcf424c414803a184b4cf7aa8b9554
 SHA512:
-  metadata.gz: 6c4f42032dee53cbfd4898dc0bdc9fae67146afdd68fe132c6d5338f4a9b21115057b8b981b70fde957a033266d66b471f2f06dd3313471c42c3de94c26802b6
-  data.tar.gz: bc1dd886ec97c7129f362bc56b2c9cd4fa4d98a5c6a45c7f93e1d74c2e7ebc8dfa10221380cd5bff34cf0f12c6fd7449be0bb16b307d63482b8048e08388e8fe
+  metadata.gz: 0cc9016ae45bb4e64c586a316ee13bed3799c1aa6798fc90af5566ef1800c8d8e62340c8cc7384bc60bfe5d4122cb0a2fa02eb2883b9bd081293c7192de5d6a2
+  data.tar.gz: 302d7d9c68e3c82404992ea49bb874e6b934fe02177481f838b13729fc285d6611c1bbf248199c5396ffa9a5e0a212f2bc75ee772b33556f06328ddf1bb71db0

data/forkr.gemspec

@@ -1,12 +1,12 @@
 Gem::Specification.new do |s|
   s.name        = 'forkr'
-  s.version     = '0.1.7'
+  s.version     = '1.0.0'
   s.date        = '2015-03-22'
   s.summary     = "A pre-forking worker host - shamelessly inspired by unicorn."
   s.description = "Forkr is a preforking worker host, shamelessly inspired by unicorn. It exists to easily fork and scale ruby programs which aren't rack-based."
   s.authors     = ["Trey Evans"]
   s.email       = 'lewis.r.evans@gmail.com'
-  s.files       = ["lib/forkr.rb", "forkr.gemspec", "README.md"]
+  s.files       = ["lib/forkr.rb", "lib/multi_forkr.rb", "forkr.gemspec", "README.md"]
   s.homepage    = 'https://github.com/TreyE/forkr'
   s.license     = 'MIT'
 end

data/lib/multi_forkr.rb

@@ -0,0 +1,163 @@
+class MultiForkr
+
+  # The PID of the Forkr master
+  # @return [Fixnum]
+  attr_reader :master_pid
+
+  # Child Process Definitions
+  # @return Hash<Object, Integer>
+  attr_reader :child_defs
+ 
+  # Child process pids.
+  # @return Hash<Object, [Pids]>
+  attr_reader :child_sets
+
+  # @param forklets Hash<Object, Integer> the worker objects, with counts
+  def initialize(forklets)
+    @child_defs = forklets
+    @master_pid = $$
+    @child_sets = Hash.new { |h, k| h[k] = Array.new }
+    @in_shutdown = false
+  end
+
+  # Start the master, and spawn workers
+  # @return [nil]
+  def run
+    @inbound, @outbound = IO.pipe
+    Signal.trap('CHLD') { dead_child }
+    Signal.trap('INT') { interrupt }
+    Signal.trap('TERM') { shutdown }
+    Signal.trap('QUIT') { core_dump_quit }
+    master_loop
+  end
+
+  protected
+
+  attr_reader :inbound, :outbound
+
+  def send_wake_notice(notice)
+    return(nil) if $$ != master_pid
+    return(nil) if @in_shutdown
+    @outbound.write(notice)
+  end
+
+  def core_dump_quit
+    send_wake_notice("Q")
+  end
+
+  def interrupt
+    send_wake_notice("I")
+  end
+
+  def shutdown
+    send_wake_notice("T")
+  end
+
+  def dead_child
+    send_wake_notice("D")
+  end
+
+  def spawn_worker(forklet)
+    if new_pid = fork
+      existing_worker_pids = @child_sets[forklet]
+      @child_sets[forklet] = existing_worker_pids + [new_pid]
+    else
+      worker_loop(forklet)
+    end
+  end
+
+  def shutdown_using(sig)
+    @in_shutdown = true
+    signal_all_workers(sig)
+    raise StopIteration.new
+  end
+
+  def master_loop
+    catch(:bail_because_im_a_worker) do
+      ensure_right_worker_count
+      loop do
+        fds = IO.select([@inbound],nil,nil,2)
+        unless fds.nil?
+          data_read = fds.first.first.read(1)
+          if data_read == "I"
+            shutdown_using(:INT)
+          elsif data_read == "T"
+            shutdown_using(:TERM)
+          elsif data_read == "Q"
+            shutdown_using(:QUIT)
+          end
+        end
+        prune_workers
+        ensure_right_worker_count
+      end
+      reap_all_workers
+      @outbound.close
+      @inbound.close
+    end
+  end
+
+  def reap_all_workers
+    begin
+      wpid, status = Process.waitpid2(-1, Process::WNOHANG)
+    rescue Errno::ECHILD
+      break
+    end while true
+  end
+
+  def ensure_right_worker_count
+    @child_defs.each_pair do |k, v|
+      existing_workers = @child_sets[k]
+      off_by = v - existing_workers.length
+      if off_by > 0
+        off_by.times do
+          spawn_worker(k)
+        end
+      elsif off_by < 0
+        existing_workers.take(off_by.abs).each do |kid|
+          signal_worker(kid, :TERM)
+        end
+      end
+    end
+  end
+
+  def children
+    @child_sets.values.map { |v| v }
+  end
+
+  def signal_all_workers(sig)
+    @children.each { |c| signal_worker(c, sig) }
+  end
+
+  def signal_worker(wpid, signal)
+    begin
+      Process.kill(signal, wpid)
+    rescue Errno::ESRCH
+    end
+  end
+
+  def prune_workers
+    new_sets = {}
+    @child_sets.each_pair do |k, v|
+      living_children = v.reject { |pid| child_dead?(pid) }
+      new_sets[k] = living_children
+    end
+    @child_sets = new_sets
+  end
+
+  def worker_loop(forklet)
+    forklet.after_fork if forklet.respond_to?(:after_fork)
+    @inbound.close
+    @outbound.close
+    $stderr.puts "Worker spawned as #{$$}!"
+    forklet.run
+    throw(:bail_because_im_a_worker)
+  end
+
+  def child_dead?(pid)
+    status = Process.waitpid(pid, Process::WNOHANG)
+    unless status.nil?
+      $stderr.puts "Process #{pid} dead: #{status}"
+    end
+    !status.nil?
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forkr
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 1.0.0
 platform: ruby
 authors:
 - Trey Evans
@@ -20,6 +20,7 @@ files:
 - README.md
 - forkr.gemspec
 - lib/forkr.rb
+- lib/multi_forkr.rb
 homepage: https://github.com/TreyE/forkr
 licenses:
 - MIT