everything related to duct tape audio suite (dtas)
 help / color / mirror / code / Atom feed
* [PATCH] unix_server: fix for infinite loop
@ 2014-10-18 10:18 Eric Wong
  0 siblings, 0 replies; only message in thread
From: Eric Wong @ 2014-10-18 10:18 UTC (permalink / raw)
  To: dtas-all

Occasionally, killing a sink from an external process could result in an
infinite loop due to the lack of close notification from __dst_error (in
DTAS::Buffer) up to the top-level event loop.  Since it is not easy to
notify the top-level event loop, we'll detect closed IOs after-the-fact
and retry as needed in a cold rescue path.

This fixes an occasional error (usually when using a non-parallel make)
in the test suite:

Timeout::Error: execution expired
    $HOME/dtas/test/player_integration.rb:57:in `sleep'
    $HOME/dtas/test/player_integration.rb:57:in `block in wait_pid_dead'
    $HOME/$RUBY/lib/ruby/2.2.0/timeout.rb:91:in `block in timeout'
    $HOME/$RUBY/lib/ruby/2.2.0/timeout.rb:35:in `block in catch'
    $HOME/$RUBY/lib/ruby/2.2.0/timeout.rb:35:in `catch'
    $HOME/$RUBY/lib/ruby/2.2.0/timeout.rb:35:in `catch'
    $HOME/$RUBY/lib/ruby/2.2.0/timeout.rb:106:in `timeout'
    $HOME/dtas/test/player_integration.rb:54:in `wait_pid_dead'
    test/test_player_integration.rb:42:in `test_sink_killed_during_play'
 lib/dtas/unix_server.rb | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/dtas/unix_server.rb b/lib/dtas/unix_server.rb
index c3db9f4..4b26555 100644
--- a/lib/dtas/unix_server.rb
+++ b/lib/dtas/unix_server.rb
@@ -99,7 +99,13 @@ class DTAS::UNIXServer # :nodoc:
   def run_once
     # give IO.select one-shot behavior, snapshot and replace the watchlist
-    r = IO.select(@readers.keys, @writers.keys) or return
+    begin
+      r = IO.select(@readers.keys, @writers.keys) or return
+    rescue IOError
+      # this only happens when sinks error out
+      @writers.delete_if { |io| io.to_io.closed? }
+      retry
+    end
     @hot_read = r[0]
     r[1].each do |io|

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2014-10-18 10:28 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-10-18 10:18 [PATCH] unix_server: fix for infinite loop Eric Wong

Code repositories for project(s) associated with this inbox:


This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).