summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-01-08 04:12:39 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-01-08 04:12:39 +0000
commit3e9e4a6a96758a3bfbdf7054419a054f00c1d6b6 (patch)
treea066fb8d79b69b224c77a17ee8b4383d6736a261
parent38e89273ede48d5864bca9a9450dd2ab6bae85d9 (diff)
lib/timeout.rb: fallback to Timeout::Error
* lib/timeout.rb (Timeout::ExitException.catch): pass arguments for new instance. * lib/timeout.rb (Timeout::ExitException#exception): fallback to Timeout::Error if couldn't throw. [ruby-dev:47872] [Bug #9380] * lib/timeout.rb (Timeout#timeout): initialize ExitException with message for the fallback case. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44523 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog11
-rw-r--r--lib/timeout.rb16
-rw-r--r--test/test_timeout.rb11
3 files changed, 34 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 5793a9a8bbd..a0a2ba0eb71 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Wed Jan 8 13:12:41 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/timeout.rb (Timeout::ExitException.catch): pass arguments
+ for new instance.
+
+ * lib/timeout.rb (Timeout::ExitException#exception): fallback to
+ Timeout::Error if couldn't throw. [ruby-dev:47872] [Bug #9380]
+
+ * lib/timeout.rb (Timeout#timeout): initialize ExitException with
+ message for the fallback case.
+
Tue Jan 7 12:43:06 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/timeout.rb (Timeout#timeout): should not rescue ordinarily
diff --git a/lib/timeout.rb b/lib/timeout.rb
index 441f8d4236b..d805dce2a3f 100644
--- a/lib/timeout.rb
+++ b/lib/timeout.rb
@@ -28,15 +28,23 @@ module Timeout
class ExitException < ::Exception # :nodoc:
attr_reader :thread
- def self.catch
- exc = new
+ def self.catch(*args)
+ exc = new(*args)
exc.instance_variable_set(:@thread, Thread.current)
exc.freeze
::Kernel.catch(exc) {yield exc}
end
def exception(*)
- throw(self, caller) if self.thread == Thread.current
+ if self.thread == Thread.current
+ bt = caller
+ begin
+ throw(self, bt)
+ rescue ArgumentError => e
+ raise unless e.message.start_with?("uncaught throw")
+ raise Error, message, backtrace
+ end
+ end
self
end
end
@@ -95,7 +103,7 @@ module Timeout
bt = e.backtrace
end
else
- bt = ExitException.catch(&bl)
+ bt = ExitException.catch(message, &bl)
end
rej = /\A#{Regexp.quote(__FILE__)}:#{__LINE__-4}\z/o
bt.reject! {|m| rej =~ m}
diff --git a/test/test_timeout.rb b/test/test_timeout.rb
index c0d6e1bf653..117c1402fa3 100644
--- a/test/test_timeout.rb
+++ b/test/test_timeout.rb
@@ -75,4 +75,15 @@ class TestTimeout < Test::Unit::TestCase
end
end
end
+
+ def test_enumerator_next
+ bug9380 = '[ruby-dev:47872] [Bug #9380]: timeout in Enumerator#next'
+ e = (o=Object.new).to_enum
+ def o.each
+ sleep
+ end
+ assert_raise_with_message(Timeout::Error, 'execution expired', bug9380) do
+ Timeout.timeout(0.01) {e.next}
+ end
+ end
end