prefork_engine 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d61cdcde16f3e999e4fb7335f9f799bec53dd4ec
-  data.tar.gz: aca8bdb8dde327a138f9d3291f998c3aecbdc004
+  metadata.gz: 913fd5c478bf07925ad2f434c57c260b65377ee6
+  data.tar.gz: 2760508f97238333c076016edddb5fc97a693ac9
 SHA512:
-  metadata.gz: 7d9b252d0eee1b472bc81c01fd76b367ad354637466018dd6367f55780d17289056bbd3d13b45d726d07b3003d4fe2089c322ef94fafa7e8c604d80ae3c4e8c9
-  data.tar.gz: 099b01f4de3e829ef010bc34519ac2fcd7665ff8a77bb8f67a054d55756a80588cff5a5b3e4f8a52bddc886743736c490341e0198910f537b3557f8f5075a4f7
+  metadata.gz: ddfb88f037f3404eb74b3d518acc0bacaea5bdd0eb58540b329c2b7d6830a8c5fcadde8d83b4dcead4a1a1b83e61387c5d13373be1df428fc98b8ac2ef759ac1
+  data.tar.gz: 63ed40cfb577c17e28e127310816ae66a6886870468616805a346a93028d2606565c1c141d9a69760a9d33f2ce799624fd6feeff51f6ebd35f71d8d15f08fb6a

data/.travis.yml

@@ -2,3 +2,4 @@ language: ruby
 rvm:
   - 2.0.0
   - 2.1.5
+  - 2.2.3

data/Changes

@@ -1,3 +1,7 @@
+0.0.6
+
+    - implement wait_all_children(timeout)
+
 0.0.5 2014-12-19T16:39:31Z
 
     - clean up code

data/lib/prefork_engine.rb

@@ -1,5 +1,6 @@
 require "prefork_engine/version"
 require 'proc/wait3'
+require 'timeout'
 
 class PreforkEngine
   attr_reader :signal_received
@@ -76,7 +77,7 @@ class PreforkEngine
           @worker_pids[pid] = @generation
           self._update_spawn_delay(@options["spawn_interval"])
       end
-      if r = self._wait()
+      if r = self._wait(action <= 0 ? 1 : 0)
         self._on_child_reap(r.pid, r.status)
         if @worker_pids.delete(r.pid) == @generation && r.status != 0
           self._update_spawn_delay(@options["err_respawn_interval"])
@@ -146,43 +147,59 @@ class PreforkEngine
     return t
   end
 
-  def wait_all_children
-    #XXX todo timeout
-    while !@worker_pids.keys.empty?
-      if r = self._wait()
-        if @worker_pids.delete(r.pid)
-          self._on_child_reap(r.pid, r.status)
+  def wait_all_children(timeout = 0)
+    wait_loop = proc {
+      while !@worker_pids.keys.empty?
+        if r = self._wait(1)
+          if @worker_pids.delete(r.pid)
+            self._on_child_reap(r.pid, r.status)
+          end
         end
       end
+    }
+    if timeout > 0
+      begin
+       timeout(timeout){
+         wait_loop.call
+       }
+     rescue Timeout::Error
+       # ignore
+      end
+    else
+      wait_loop.call()
     end
-    return 0
+    return self.num_workers();
   end # wait_all_children
 
   def _update_spawn_delay(secs)
     @_no_adjust_until = secs ? Time.now.to_f + secs : 0.0
   end
 
-  def _wait()
-    #XXX always blocking
-    delayed_task_sleep = self._handle_delayed_task()
-    delayed_fork_sleep = self._decide_action > 0 ? [@_no_adjust_until - Time.now.to_f,0].max : nil
-    sleep_secs = [delayed_task_sleep,delayed_fork_sleep,self._max_wait].select {|v| v != nil}
-    begin
-      if sleep_secs.min != nil
-        sleep(sleep_secs.min)
-        # nonblock
-        return Process.wait3(1)
-      else
-        #block
-        return Process.wait3(0)
+  def _wait(block)
+    if !block
+      self._handle_delayed_task()
+      return Process.wait3(Process::WNOHANG)
+    else
+      delayed_task_sleep = self._handle_delayed_task()
+      delayed_fork_sleep = self._decide_action > 0 ? [@_no_adjust_until - Time.now.to_f,0].max : nil
+      sleep_secs = [delayed_task_sleep,delayed_fork_sleep,self._max_wait].select {|v| v != nil}
+      begin
+        if sleep_secs.min != nil
+          sleep(sleep_secs.min)
+          # nonblock
+          return Process.wait3(Process::WNOHANG)
+        else
+          #block
+          return Process.wait3(0)
+        end
+      rescue Errno::EINTR
+        # wait for timer thread?
+        sleep 0.02
+      rescue Errno::ECHILD
+        # nothing
       end
-    rescue Errno::EINTR
-      # wait for timer thread?
-      sleep 0.02
-    rescue Errno::ECHILD
-      # nothing
+      return nil
     end
-    return nil
   end #_wait
 
   def _max_wait

data/lib/prefork_engine/version.rb

@@ -1,3 +1,3 @@
 class PreforkEngine
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/spec/06_wait_timeout_spec.rb

@@ -0,0 +1,38 @@
+require 'spec_helper'
+
+pm = PreforkEngine.new(
+  "max_workers" => 3,
+  "spawn_interval" => 1,
+  "trap_signals" => {
+    "TERM" => ["TERM",2],
+    "HUP"  => "TERM"
+  }
+)
+while pm.signal_received != "TERM"
+  pm.start {
+    term_req = 0
+    Signal.trap("TERM",
+                proc {
+                  term_req += 1
+                  exit!(0) if term_req > 3
+                })
+    sleep 1
+    Process.kill("TERM", pm.manager_pid)
+    while true
+      sleep 1
+    end
+  }
+end
+
+send_term = 0
+while pm.wait_all_children(1) > 0
+  pm.signal_all_children("TERM")
+  send_term += 1
+end
+
+describe PreforkEngine do
+  it 'wait_timeout' do
+    expect(send_term).to be >= 3
+  end
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prefork_engine
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Masahiro Nagano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-19 00:00:00.000000000 Z
+date: 2015-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -90,6 +90,7 @@ files:
 - spec/02_reconfigure_spec.rb
 - spec/04_interval_spec.rb
 - spec/05_before_after_fork_spec.rb
+- spec/06_wait_timeout_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/kazeburo/prefork_engine/
 licenses:
@@ -111,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: a simple prefork server framework
@@ -120,4 +121,5 @@ test_files:
 - spec/02_reconfigure_spec.rb
 - spec/04_interval_spec.rb
 - spec/05_before_after_fork_spec.rb
+- spec/06_wait_timeout_spec.rb
 - spec/spec_helper.rb