Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add signature of Timeout #586

Merged
merged 10 commits into from
Feb 11, 2021
88 changes: 88 additions & 0 deletions stdlib/timeout/0/timeout.rbs
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
# Timeout long-running blocks
#
# ## Synopsis
#
# require 'timeout'
# status = Timeout::timeout(5) {
# # Something that should be interrupted if it takes more than 5 seconds...
# }
#
# ## Description
#
# Timeout provides a way to auto-terminate a potentially long-running operation
# if it hasn't finished in a fixed amount of time.
#
# Previous versions didn't use a module for namespacing, however #timeout is
# provided for backwards compatibility. You should prefer Timeout.timeout
# instead.
#
# ## Copyright
#
# Copyright
# : (C) 2000 Network Applied Communication Laboratory, Inc.
# Copyright
# : (C) 2000 Information-technology Promotion Agency, Japan
#
module Timeout
# Perform an operation in a block, raising an error if it takes longer than
# `sec` seconds to complete.
#
# `sec`
# : Number of seconds to wait for the block to terminate. Any number may be
# used, including Floats to specify fractional seconds. A value of 0 or
# `nil` will execute the block without any timeout.
# `klass`
# : Exception Class to raise if the block fails to terminate in `sec` seconds.
# Omitting will use the default, Timeout::Error
# `message`
# : Error message to raise with Exception Class. Omitting will use the
# default, "execution expired"
#
#
# Returns the result of the block **if** the block completed before `sec`
# seconds, otherwise throws an exception, based on the value of `klass`.
#
# The exception thrown to terminate the given block cannot be rescued inside the
# block unless `klass` is given explicitly. However, the block can use ensure to
# prevent the handling of the exception. For that reason, this method cannot be
# relied on to enforce timeouts for untrusted blocks.
#
# 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, so you can call it directly as Timeout.timeout().
#
def self.timeout: (Numeric? sec, ?singleton(Exception) klass, ?String message) { (Numeric sec) -> untyped } -> untyped
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about using self? instead of defining singleton and instance methods individually?
https://github.com/ruby/rbs/blob/26baa08e184d1d27c18a34e6683493db42f5fe77/docs/syntax.md#method-definition

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for your recommendations.
I fixed it in 5ff07e8

m11o marked this conversation as resolved.
Show resolved Hide resolved

private

# Perform an operation in a block, raising an error if it takes longer than
# `sec` seconds to complete.
#
# `sec`
# : Number of seconds to wait for the block to terminate. Any number may be
# used, including Floats to specify fractional seconds. A value of 0 or
# `nil` will execute the block without any timeout.
# `klass`
# : Exception Class to raise if the block fails to terminate in `sec` seconds.
# Omitting will use the default, Timeout::Error
# `message`
# : Error message to raise with Exception Class. Omitting will use the
# default, "execution expired"
#
#
# Returns the result of the block **if** the block completed before `sec`
# seconds, otherwise throws an exception, based on the value of `klass`.
#
# The exception thrown to terminate the given block cannot be rescued inside the
# block unless `klass` is given explicitly. However, the block can use ensure to
# prevent the handling of the exception. For that reason, this method cannot be
# relied on to enforce timeouts for untrusted blocks.
#
# 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, so you can call it directly as Timeout.timeout().
#
def timeout: (Numeric? sec, ?singleton(Exception) klass, ?String message) { (Numeric sec) -> untyped } -> untyped
end

Timeout::VERSION: String
41 changes: 41 additions & 0 deletions test/stdlib/Timeout_test.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
require_relative "test_helper"
require "timeout"
require "bigdecimal"

class TimeoutSingletonTest < Test::Unit::TestCase
include TypeAssertions

library "timeout"
testing "singleton(::Timeout)"

class TimeoutTestException < Exception; end # exception class for test

def test_timeout
proc = Proc.new { |sec| sec * sec }
assert_send_type "(::Integer sec) { (::Integer sec) -> untyped } -> untyped",
Timeout, :timeout, 5, &proc
assert_send_type "(::Float sec) { (::Float sec) -> untyped } -> untyped",
Timeout, :timeout, 1.2, &proc
assert_send_type "(::Rational sec) { (::Rational sec) -> untyped } -> untyped",
Timeout, :timeout, Rational(5, 3), &proc
assert_send_type "(::BigDecimal sec) { (::BigDecimal sec) -> untyped } -> untyped",
Timeout, :timeout, BigDecimal("1.123456789123456789"), &proc

hard_process = Proc.new { _calc_pi }
refute_send_type "(::Numeric sec) { (::Numeric sec) -> untyped } -> untyped",
Timeout, :timeout, 0.001, &hard_process
refute_send_type "(::Numeric sec, singleton(Exception) klass) { (::Numeric sec) -> untyped } -> untyped",
Timeout, :timeout, 0.001, TimeoutTestException, &hard_process
refute_send_type "(::Numeric sec, singleton(Exception) klass, String message) { (::Numeric sec) -> untyped } -> untyped",
Timeout, :timeout, 0.001, TimeoutTestException, "timeout test error", &hard_process
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure that this refute_send_type usage is appropriate.

I guess refute_send_type is designed to check an unacceptable type. For example, Timeout.timeout('1') is invalid with the type, so checking Timeout.timeout('1') call with refute_send_type is the designed usage.

But these tests, such as Timeout.timeout(0.001){...}, is acceptable with the type. It just checks Timeout.timeout raises an error, but the raised error is an "expected" error. So the refute_send_type calls just suppress the error. I think refute_send_type is not appropriate in this case.

related: #588

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for your advice! I can understand.
I fixed it in 083beb9 . Would you please review again.

end

def _calc_pi
min = [0, 0]
loop do
x = rand
y = rand
x**2 + y**2 < 1.0 ? min[0] += 1 : min[1] += 1
end
end
end