This should prevent missed/delayed wakeups if repeatedly
kill(2)-ed.
---
lib/yahns/server.rb | 3 ++-
lib/yahns/server_mp.rb | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/lib/yahns/server.rb b/lib/yahns/server.rb
index d13c57e..208b5ee 100644
--- a/lib/yahns/server.rb
+++ b/lib/yahns/server.rb
@@ -476,7 +476,8 @@ def reap_reexec
end
def sp_sig_handle(alive)
- @sev.wait_readable(alive ? nil : 0.01)
+ tout = alive ? (@sig_queue.empty? ? nil : 0) : 0.01
+ @sev.wait_readable(tout)
@sev.yahns_step
case sig = @sig_queue.shift
when :QUIT, :TERM, :INT
diff --git a/lib/yahns/server_mp.rb b/lib/yahns/server_mp.rb
index 5467674..d56d1ed 100644
--- a/lib/yahns/server_mp.rb
+++ b/lib/yahns/server_mp.rb
@@ -157,7 +157,8 @@ def run_mp_worker(worker)
def mp_sig_handle(watch, alive)
# not performance critical
watch.delete_if { |io| io.to_io.closed? }
- if r = select(watch, nil, nil, alive ? nil : 0.1)
+ tout = alive ? (@sig_queue.empty? ? nil : 0) : 0.01
+ if r = select(watch, nil, nil, tout)
r[0].each(&:yahns_step)
end
case @sig_queue.shift
--
unsubscribe: one-click, see List-Unsubscribe header
archive: https://yhbt.net/yahns-public/
