diff options
author | kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-05-18 11:31:58 +0000 |
---|---|---|
committer | kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-05-18 11:31:58 +0000 |
commit | da3d9e99dd50f0f99741ca2f90b051d59b4f7f93 (patch) | |
tree | f9e4e71ba9c0c2ff19022eb90651fd0c764e564e | |
parent | 73bb32d4dde058f4795b0e3b0869abc8054a7006 (diff) | |
download | ruby-da3d9e99dd50f0f99741ca2f90b051d59b4f7f93.tar.gz |
* lib/timeout.rb (Timeout#timeout): don't leak "execution expired"
exception. [Bug #4283] [ruby-core:34534].
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31623 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | lib/timeout.rb | 32 |
2 files changed, 22 insertions, 15 deletions
@@ -1,3 +1,8 @@ +Wed May 18 20:25:04 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com> + + * lib/timeout.rb (Timeout#timeout): don't leak "execution expired" + exception. [Bug #4283] [ruby-core:34534]. + Wed May 18 06:09:24 2011 Eric Hodel <drbrain@segment7.net> * lib/cmath.rb: Add some examples and improve documentation. Patch by diff --git a/lib/timeout.rb b/lib/timeout.rb index f5b76783cd..f9d52abda6 100644 --- a/lib/timeout.rb +++ b/lib/timeout.rb @@ -46,17 +46,24 @@ module Timeout return yield(sec) if sec == nil or sec.zero? exception = klass || Class.new(ExitException) begin - x = Thread.current - y = Thread.start { - begin - sleep sec - rescue => e - x.raise e - else - x.raise exception, "execution expired" if x.alive? + begin + x = Thread.current + y = Thread.start { + begin + sleep sec + rescue => e + x.raise e + else + x.raise exception, "execution expired" + end + } + return yield(sec) + ensure + if y + y.kill + y.join # make sure y is dead. end - } - return yield(sec) + end rescue exception => e rej = /\A#{Regexp.quote(__FILE__)}:#{__LINE__-4}\z/o (bt = e.backtrace).reject! {|m| rej =~ m} @@ -68,11 +75,6 @@ module Timeout raise if klass # if exception class is specified, it # would be expected outside. raise Error, e.message, e.backtrace - ensure - if y and y.alive? - y.kill - y.join # make sure y is dead. - end end end |