diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-01-07 03:42:37 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-01-07 03:42:37 +0000 |
| commit | 9f5537c5b39b230360af793977d9ddb5b539f4de (patch) | |
| tree | 58a893d1219f54fab838612764d652117b7be3a1 /lib | |
| parent | 765ec401207262d1ec8343467ac1547083a00309 (diff) | |
timeout.rb: defer creating custom exception
* lib/timeout.rb (Timeout#timeout): when a custom exception is given,
no instance is needed to be caught, so defer creating new instance
until it is raised. [ruby-core:59511] [Bug #9354]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44517 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/timeout.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/timeout.rb b/lib/timeout.rb index ad951d2ffa..f2ed725229 100644 --- a/lib/timeout.rb +++ b/lib/timeout.rb @@ -67,7 +67,7 @@ module Timeout return yield(sec) if sec == nil or sec.zero? message = "execution expired" e = Error - bt = catch((klass||ExitException).new) do |exception| + bl = proc do |exception| begin x = Thread.current y = Thread.start { @@ -80,7 +80,7 @@ module Timeout end } return yield(sec) - rescue (klass||ExitException) => e + rescue klass => e e.backtrace ensure if y @@ -89,6 +89,7 @@ module Timeout end end end + bt = klass ? bl.call(klass) : catch((klass = ExitException).new, &bl) rej = /\A#{Regexp.quote(__FILE__)}:#{__LINE__-4}\z/o bt.reject! {|m| rej =~ m} level = -caller(CALLER_OFFSET).size |