diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-01-07 03:43:08 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-01-07 03:43:08 +0000 |
commit | 97c0aaea71f9855403dcf14f505079822029d439 (patch) | |
tree | 7656d2b6a72e8e6963dbe465abd99e38b336690b /lib/timeout.rb | |
parent | 9f5537c5b39b230360af793977d9ddb5b539f4de (diff) |
timeout.rb: fix for ExitException
* 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.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44518 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/timeout.rb')
-rw-r--r-- | lib/timeout.rb | 21 |
1 files changed, 14 insertions, 7 deletions
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 |