safe_timeout 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a1dc91fe9838d18748dfa219507d52abfbbc072
-  data.tar.gz: 2415cf891a23e2cb38a608c489ab7fa9e18be384
+  metadata.gz: d1f06d3a6a1b3d03875ee2501d1bfa1ceefcc676
+  data.tar.gz: 7d5a7e5273989529d22bddb49927ae091866ba96
 SHA512:
-  metadata.gz: 00e4442f99e7143a0fbef4caf51c6f023578b13def7d0c058c393577c049e4aca26cf4874c8311e3869f9390b2d6b7650dbfd7533e8dab0144b2e1645b337966
-  data.tar.gz: 007b456918328c1b87edf436538af4bf1cb62fec547b5dd00751409aee6aaba24555523f01ab12ba118e02afb7046b8ed29d1b817f776be1254e07c865b5f326
+  metadata.gz: 48ef6022f8aecfb0e69c348adec09d589c3dba1929896ce843685f45123bc6d43605f66823ee3271b2a73b5d70852b159f37906925160e8559f930f0fedd9b75
+  data.tar.gz: 14e77cc5ca9f6c1f24459fda1e35186697af31a75814658f32591bc999231de8d4c85f78d6cf8f1755a0e58341eaa3097d9f0f8b6c9e68f5f31f8bdeb0b6c35b

data/bin/safe_timeout

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require 'safe_timeout'
+SafeTimeout::InterruptingChildProcess.new(*ARGV).wait_for_timeout

data/lib/safe_timeout/interrupting_child_process.rb

@@ -1,43 +1,25 @@
 module SafeTimeout
   class InterruptingChildProcess
 
-    def initialize(options={})
-      @expiration = Time.now.to_f + options.fetch(:timeout)
-      @on_timeout = options.fetch(:on_timeout)
-    end
+    def initialize(ppid, expiration)
+      @ppid = ppid.to_i
+      @expiration = expiration.to_f
 
-    def start(&block)
-      Signal.trap("TRAP", &@on_timeout)
-      @child_pid = Kernel.fork { wait_for_expiration }
-      yield
-    ensure
-      begin
-        stop
-      rescue Errno::ESRCH
-      end
+      abort "Invalid pid to monitor: #{@ppid}" if @ppid == 0
+      abort "Invalid expiration: #{@expiration}" if @expiration == 0.0
     end
 
-    def stop
-      # Tell that child to stop interrupting!
-      Process.kill("HUP", @child_pid)
+    def notify_parent_of_expiration
+      SafeTimeout.send_signal('TRAP', @ppid)
     end
 
-    def wait_for_expiration
-      Signal.trap("HUP") { exit 0 }
+    def wait_for_timeout
+      Signal.trap('HUP') { exit 0 }
+
+      sleep [@expiration - Time.now.to_f, 0.1].max
 
-      # If the parent dies unexpectedly and the child is never told to
-      # stop, it becomes an orphan and is given to the init process (1)
-      # or worse yet it becomes a zombie with parent 0. In either case,
-      # stop interrupting!
-      while Process.ppid > 1
-        sleep 0.1
-        if Time.now.to_f > @expiration
-          Process.kill("TRAP", Process.ppid)
-          return
-        end
-      end
+      notify_parent_of_expiration
     end
 
   end
-
 end

data/lib/safe_timeout/spawner.rb

@@ -0,0 +1,32 @@
+module SafeTimeout
+  class Spawner
+
+    def initialize(options={})
+      @expiration = Time.now.to_f + options.fetch(:timeout)
+      @on_timeout = options.fetch(:on_timeout)
+    end
+
+    def start(&block)
+      original = Signal.trap('TRAP', &@on_timeout) || 'DEFAULT'
+      spawn_interrupter
+      yield
+    ensure
+      Signal.trap('TRAP', original)
+      stop
+    end
+
+    def stop
+      # Tell that child to stop interrupting!
+      SafeTimeout.send_signal('HUP', @child_pid)
+    end
+
+    def spawn_interrupter
+      # Create a light-weight child process to notify this process if it is
+      # taking too long
+      bin = Gem.bin_path('safe_timeout', 'safe_timeout')
+      @child_pid = Process.spawn(bin, $$.to_s, @expiration.to_s)
+      Process.detach(@child_pid)
+    end
+
+  end
+end

data/lib/safe_timeout/version.rb

@@ -1,3 +1,3 @@
 module SafeTimeout
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/safe_timeout.rb

@@ -1,15 +1,23 @@
-# Ruby's Timeout is broken and highly dangerous. To avoid this risk we
-# instead use a child process to handle the timeout. We fork it and let
-# it issue a SIGINT (Ctrl-C) to the parent if the timeout is reached.
+#
+# Ruby's Timeout is broken and highly dangerous. To avoid this risk we instead
+# use a child process to handle the timeout. We fork it and let it issue a SIGINT
+# (Ctrl-C) to the parent if the timeout is reached.
+#
 module SafeTimeout
 
   autoload :InterruptingChildProcess, 'safe_timeout/interrupting_child_process'
+  autoload :Spawner, 'safe_timeout/spawner'
 
   def self.timeout(sec, klass=nil, &block)
-    InterruptingChildProcess.new(
+    Spawner.new(
       :timeout => sec,
       :on_timeout => lambda { |_| raise(klass || Timeout::Error) }
     ).start(&block)
   end
 
+  def self.send_signal(signal, pid)
+    Process.kill(signal, pid) if pid
+  rescue Errno::ESRCH
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: safe_timeout
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - David McCullars
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-17 00:00:00.000000000 Z
+date: 2015-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -56,7 +56,8 @@ description: A safer alternative to Ruby's Timeout that uses unix processes inst
   of threads.
 email:
 - david.mccullars@gmail.com
-executables: []
+executables:
+- safe_timeout
 extensions: []
 extra_rdoc_files: []
 files:
@@ -66,9 +67,11 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/safe_timeout
 - circle.yml
 - lib/safe_timeout.rb
 - lib/safe_timeout/interrupting_child_process.rb
+- lib/safe_timeout/spawner.rb
 - lib/safe_timeout/version.rb
 - safe_timeout.gemspec
 - spec/lib/safe_timeout_spec.rb