diff options
| author | Lars Kanis <[email protected]> | 2022-09-25 11:14:11 +0200 |
|---|---|---|
| committer | git <[email protected]> | 2022-09-28 01:59:35 +0900 |
| commit | 9d56d9975d867c94ab2a6d76e4482112ab6c3319 (patch) | |
| tree | ecf30a93083f46d0f4efae0db32b6429314ac29f | |
| parent | 1a06bc94d96ab4be4386b0ccd802d11380fa4e84 (diff) | |
[ruby/timeout] Explicit add the timeout thread to default ThreadGroup
Otherwise the timeout thread would be added to the ThreadGroup of the thread that makes the first call to Timeout.timeout .
Fixes bug 19020: https://bugs.ruby-lang.org/issues/19020
Add a test case to make sure the common thread doesn't leak to another ThreadGroup
https://github.com/ruby/timeout/commit/c4f1385c9a
| -rw-r--r-- | lib/timeout.rb | 1 | ||||
| -rw-r--r-- | test/test_timeout.rb | 13 |
2 files changed, 14 insertions, 0 deletions
diff --git a/lib/timeout.rb b/lib/timeout.rb index 2aad1d7465..badba9a397 100644 --- a/lib/timeout.rb +++ b/lib/timeout.rb @@ -120,6 +120,7 @@ module Timeout requests.reject!(&:done?) end end + ThreadGroup::Default.add(watcher) watcher.name = "Timeout stdlib thread" watcher.thread_variable_set(:"\0__detached_thread__", true) watcher diff --git a/test/test_timeout.rb b/test/test_timeout.rb index 76de38949d..2d3dd16245 100644 --- a/test/test_timeout.rb +++ b/test/test_timeout.rb @@ -159,4 +159,17 @@ class TestTimeout < Test::Unit::TestCase assert_equal 'timeout', r.read r.close end + + def test_threadgroup + assert_separately(%w[-rtimeout], <<-'end;') + tg = ThreadGroup.new + thr = Thread.new do + tg.add(Thread.current) + Timeout.timeout(10){} + end + thr.join + assert_equal [].to_s, tg.list.to_s + end; + end + end |