From ef39866fa6e6ac91cc64f18573dea22c3f75c6e1 Mon Sep 17 00:00:00 2001
From: Eric Wong <e@80x24.org>
Date: Mon, 19 Jan 2015 09:17:51 +0000
Subject: consolidate spawn fix for Ruby [Bug #8770]

Ensure we can apply the workaround to dtas-sourceedit and our
test cases while also simplifying the existing call sites a
little.  This will also make for less code churn in 3-5
years down the line when we drop <= 2.1 support.
---
 lib/dtas/partstats.rb |  8 ++------
 lib/dtas/process.rb   | 15 +++------------
 lib/dtas/spawn_fix.rb |  8 ++++++++
 3 files changed, 13 insertions(+), 18 deletions(-)
 create mode 100644 lib/dtas/spawn_fix.rb

(limited to 'lib/dtas')

diff --git a/lib/dtas/partstats.rb b/lib/dtas/partstats.rb
index 6c714b3..546b88b 100644
--- a/lib/dtas/partstats.rb
+++ b/lib/dtas/partstats.rb
@@ -10,6 +10,7 @@ require_relative 'sigevent'
 class DTAS::PartStats
   CMD = 'sox "$INFILE" -n $TRIMFX $SOXFX stats $STATSOPTS'
   include DTAS::Process
+  include DTAS::SpawnFix
   attr_reader :key_idx
   attr_reader :key_width
 
@@ -56,12 +57,7 @@ class DTAS::PartStats
     env["INFILE"] = @infile
     env["TRIMFX"] = "trim #{trim_part.tbeg}s #{trim_part.tlen}s"
     opts = { pgroup: true, close_others: true, err: wr }
-    pid = begin
-      Process.spawn(env, CMD, opts)
-    rescue Errno::EINTR
-      # workaround for older Rubies https://bugs.ruby-lang.org/issues/8770
-      retry
-    end
+    pid = spawn(env, CMD, opts)
     wr.close
     [ pid, rd ]
   end
diff --git a/lib/dtas/process.rb b/lib/dtas/process.rb
index c0ce9a3..56e88e8 100644
--- a/lib/dtas/process.rb
+++ b/lib/dtas/process.rb
@@ -7,6 +7,7 @@ require_relative 'xs'
 module DTAS::Process # :nodoc:
   PIDS = {}
   include DTAS::XS
+  include DTAS::SpawnFix
 
   def self.reaper
     begin
@@ -47,12 +48,7 @@ module DTAS::Process # :nodoc:
     opts = { close_others: true, pgroup: true }.merge!(opts)
     env = env_expand(env, opts)
 
-    pid = begin
-      Process.spawn(env, cmd, opts)
-    rescue Errno::EINTR
-      # workaround for older Rubies https://bugs.ruby-lang.org/issues/8770
-      retry
-    end
+    pid = spawn(env, cmd, opts)
     warn [ :spawn, pid, cmd ].inspect if $DEBUG
     @spawn_at = Time.now.to_f
     PIDS[pid] = self
@@ -76,12 +72,7 @@ module DTAS::Process # :nodoc:
       opts[:err] = we
     end
     env = env_expand(env, opts)
-    pid = begin
-      Process.spawn(env, *cmd, opts)
-    rescue Errno::EINTR
-      # workaround for older Rubies https://bugs.ruby-lang.org/issues/8770
-      retry
-    end
+    pid = spawn(env, *cmd, opts)
     w.close
     if err_str
       we.close
diff --git a/lib/dtas/spawn_fix.rb b/lib/dtas/spawn_fix.rb
new file mode 100644
index 0000000..dfcc884
--- /dev/null
+++ b/lib/dtas/spawn_fix.rb
@@ -0,0 +1,8 @@
+module DTAS::SpawnFix # :nodoc:
+  # workaround for older Rubies: https://bugs.ruby-lang.org/issues/8770
+  def spawn(*args)
+    super(*args)
+  rescue Errno::EINTR
+    retry
+  end if RUBY_VERSION.to_f <= 2.1
+end
-- 
cgit v1.2.3-24-ge0c7