1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* lib/timeout.rb (Timeout::timeout): made sensitive to location on the

Browse Source 
stack.  [ruby-core:15458]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15464 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2008-02-13 16:43:18 +00:00
parent c9c655bf2c
commit 8435c6bb8c
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Thu Feb 14 01:43:16 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/timeout.rb (Timeout::timeout): made sensitive to location on the
stack. [ruby-core:15458]
Thu Feb 14 00:49:53 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> Thu Feb 14 00:49:53 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* common.mk (INSTRUBY_ARGS): pass mode to install. [ruby-dev:33766] * common.mk (INSTRUBY_ARGS): pass mode to install. [ruby-dev:33766]

23
lib/timeout.rb
View File

@ -24,8 +24,13 @@
module Timeout module Timeout
# Raised by Timeout#timeout when the block times out. # Raised by Timeout#timeout when the block times out.
class Error < Interrupt class Error < RuntimeError
end end
class ExitException < ::Exception # :nodoc:
end
THIS_FILE = /\A#{Regexp.quote(__FILE__)}:/o
CALLER_OFFSET = ((c = caller[0]) && THIS_FILE =~ c) ? 1 : 0
# Executes the method's block. If the block execution terminates before # Executes the method's block. If the block execution terminates before
# +sec+ seconds has passed, it returns the result value of the block. # +sec+ seconds has passed, it returns the result value of the block.
@ -35,8 +40,9 @@ module Timeout
# Note that this is both a method of module Timeout, so you can 'include Timeout' # Note that this is both a method of module Timeout, so you can 'include Timeout'
# into your classes so they have a #timeout method, as well as a module method, # into your classes so they have a #timeout method, as well as a module method,
# so you can call it directly as Timeout.timeout(). # so you can call it directly as Timeout.timeout().
def timeout(sec, exception = Error) #:yield: +sec+ def timeout(sec, klass = nil) #:yield: +sec+
return yield(sec) if sec == nil or sec.zero? return yield(sec) if sec == nil or sec.zero?
exception = klass || Class.new(ExitException)
begin begin
x = Thread.current x = Thread.current
y = Thread.start { y = Thread.start {
@ -44,6 +50,17 @@ module Timeout
x.raise exception, "execution expired" if x.alive? x.raise exception, "execution expired" if x.alive?
} }
return yield(sec) return yield(sec)
rescue exception => e
rej = /\A#{Regexp.quote(__FILE__)}:#{__LINE__-4}\z/o
(bt = e.backtrace).reject! {|m| rej =~ m}
level = -caller(CALLER_OFFSET).size
while THIS_FILE =~ bt[level]
bt.delete_at(level)
level += 1
end
raise if klass # if exception class is specified, it
# would be expected outside.
raise Error, e.message, e.backtrace
ensure ensure
if y and y.alive? if y and y.alive?
y.kill y.kill
@ -61,7 +78,7 @@ end
# #
# Defined for backwards compatibility with earlier versions of timeout.rb, see # Defined for backwards compatibility with earlier versions of timeout.rb, see
# Timeout#timeout. # Timeout#timeout.
def timeout(n, e = Timeout::Error, &block) def timeout(n, e = nil, &block)
Timeout::timeout(n, e, &block) Timeout::timeout(n, e, &block)
end end