diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | lib/timeout.rb | 21 | ||||
| -rw-r--r-- | test/test_timeout.rb | 8 |
3 files changed, 29 insertions, 8 deletions
@@ -1,4 +1,10 @@ -Tue Jan 7 12:42:35 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> +Tue Jan 7 12:43:06 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * lib/timeout.rb (Timeout#timeout): should not rescue ordinarily + raised ExitException, which should not be thrown. + + * lib/timeout.rb (Timeout::ExitException.catch): set @thread only if + it ought to be caught. * lib/timeout.rb (Timeout#timeout): when a custom exception is given, no instance is needed to be caught, so defer creating new instance diff --git a/lib/timeout.rb b/lib/timeout.rb index f2ed725229..753bb91ffd 100644 --- a/lib/timeout.rb +++ b/lib/timeout.rb @@ -28,10 +28,11 @@ module Timeout class ExitException < ::Exception # :nodoc: attr_reader :klass, :thread - def initialize(*) - super - @thread = Thread.current - freeze + def self.catch + exc = new + exc.instance_variable_set(:@thread, Thread.current) + exc.freeze + ::Kernel.catch(exc) {yield exc} end def exception(*) @@ -80,8 +81,6 @@ module Timeout end } return yield(sec) - rescue klass => e - e.backtrace ensure if y y.kill @@ -89,7 +88,15 @@ module Timeout end end end - bt = klass ? bl.call(klass) : catch((klass = ExitException).new, &bl) + if klass + begin + bl.call(klass) + rescue klass => e + bt = e.backtrace + end + else + bt = ExitException.catch(&bl) + end rej = /\A#{Regexp.quote(__FILE__)}:#{__LINE__-4}\z/o bt.reject! {|m| rej =~ m} level = -caller(CALLER_OFFSET).size diff --git a/test/test_timeout.rb b/test/test_timeout.rb index 08885cd54f..c0d6e1bf65 100644 --- a/test/test_timeout.rb +++ b/test/test_timeout.rb @@ -67,4 +67,12 @@ class TestTimeout < Test::Unit::TestCase assert_equal(:ok, timeout(100, err) {:ok}) end end + + def test_exit_exception + assert_raise_with_message(Timeout::ExitException, "boon") do + Timeout.timeout(10, Timeout::ExitException) do + raise Timeout::ExitException, "boon" + end + end + end end |