mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
e334bb2ce5
require extension libraries. The patch is from nobu (Nobuyoshi Nakada). * ext/thread/extconf.rb: for build ext/thread/thread.c. * include/ruby/intern.h: ditto. * thread.c: ditto. * lib/thread.rb: removed and replaced by ext/thread/thread.c. * ext/thread/thread.c: Queue, SizedQueue and ConditionVariable implementations in C. This patch is based on patches from panaggio (Ricardo Panaggio) and funny_falcon (Yura Sokolov) and ko1 (Koichi Sasada). [ruby-core:31513] [Feature #3620] * test/thread/test_queue.rb (test_queue_thread_raise): add a test for ensuring that killed thread should be removed from waiting threads. It is based on a code by ko1 (Koichi Sasada). [ruby-core:45950] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42862 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
158 lines
3.4 KiB
Ruby
158 lines
3.4 KiB
Ruby
require 'test/unit'
|
|
require 'thread'
|
|
require 'tmpdir'
|
|
require 'timeout'
|
|
require_relative '../ruby/envutil'
|
|
|
|
class TestQueue < Test::Unit::TestCase
|
|
def test_queue
|
|
grind(5, 1000, 15, Queue)
|
|
end
|
|
|
|
def test_sized_queue
|
|
grind(5, 1000, 15, SizedQueue, 1000)
|
|
end
|
|
|
|
def grind(num_threads, num_objects, num_iterations, klass, *args)
|
|
from_workers = klass.new(*args)
|
|
to_workers = klass.new(*args)
|
|
|
|
workers = (1..num_threads).map {
|
|
Thread.new {
|
|
while object = to_workers.pop
|
|
from_workers.push object
|
|
end
|
|
}
|
|
}
|
|
|
|
Thread.new {
|
|
num_iterations.times {
|
|
num_objects.times { to_workers.push 99 }
|
|
num_objects.times { from_workers.pop }
|
|
}
|
|
}.join
|
|
|
|
num_threads.times { to_workers.push nil }
|
|
workers.each { |t| t.join }
|
|
|
|
assert_equal 0, from_workers.size
|
|
assert_equal 0, to_workers.size
|
|
end
|
|
|
|
def test_sized_queue_initialize
|
|
q = SizedQueue.new(1)
|
|
assert_equal 1, q.max
|
|
assert_raise(ArgumentError) { SizedQueue.new(0) }
|
|
assert_raise(ArgumentError) { SizedQueue.new(-1) }
|
|
end
|
|
|
|
def test_sized_queue_assign_max
|
|
q = SizedQueue.new(2)
|
|
assert_equal(2, q.max)
|
|
q.max = 1
|
|
assert_equal(1, q.max)
|
|
assert_raise(ArgumentError) { q.max = 0 }
|
|
assert_equal(1, q.max)
|
|
assert_raise(ArgumentError) { q.max = -1 }
|
|
assert_equal(1, q.max)
|
|
end
|
|
|
|
def test_queue_pop_interrupt
|
|
q = Queue.new
|
|
t1 = Thread.new { q.pop }
|
|
sleep 0.01 until t1.stop?
|
|
t1.kill.join
|
|
assert_equal(0, q.num_waiting)
|
|
end
|
|
|
|
def test_sized_queue_pop_interrupt
|
|
q = SizedQueue.new(1)
|
|
t1 = Thread.new { q.pop }
|
|
sleep 0.01 until t1.stop?
|
|
t1.kill.join
|
|
assert_equal(0, q.num_waiting)
|
|
end
|
|
|
|
def test_sized_queue_push_interrupt
|
|
q = SizedQueue.new(1)
|
|
q.push(1)
|
|
t1 = Thread.new { q.push(2) }
|
|
sleep 0.01 until t1.stop?
|
|
t1.kill.join
|
|
assert_equal(0, q.num_waiting)
|
|
end
|
|
|
|
def test_thr_kill
|
|
bug5343 = '[ruby-core:39634]'
|
|
Dir.mktmpdir {|d|
|
|
timeout = 30
|
|
total_count = 250
|
|
begin
|
|
assert_normal_exit(<<-"_eom", bug5343, {:timeout => timeout, :chdir=>d})
|
|
require "thread"
|
|
#{total_count}.times do |i|
|
|
open("test_thr_kill_count", "w") {|f| f.puts i }
|
|
queue = Queue.new
|
|
r, w = IO.pipe
|
|
th = Thread.start {
|
|
queue.push(nil)
|
|
r.read 1
|
|
}
|
|
queue.pop
|
|
th.kill
|
|
th.join
|
|
end
|
|
_eom
|
|
rescue Timeout::Error
|
|
count = File.read("#{d}/test_thr_kill_count").to_i
|
|
flunk "only #{count}/#{total_count} done in #{timeout} seconds."
|
|
end
|
|
}
|
|
end
|
|
|
|
def test_queue_push_return_value
|
|
q = Queue.new
|
|
retval = q.push(1)
|
|
assert_same q, retval
|
|
end
|
|
|
|
def test_queue_clear_return_value
|
|
q = Queue.new
|
|
retval = q.clear
|
|
assert_same q, retval
|
|
end
|
|
|
|
def test_sized_queue_push_return_value
|
|
q = SizedQueue.new(1)
|
|
retval = q.push(1)
|
|
assert_same q, retval
|
|
end
|
|
|
|
def test_sized_queue_clear_return_value
|
|
q = SizedQueue.new(1)
|
|
retval = q.clear
|
|
assert_same q, retval
|
|
end
|
|
|
|
def test_queue_thread_raise
|
|
q = Queue.new
|
|
th1 = Thread.new do
|
|
begin
|
|
q.pop
|
|
rescue RuntimeError
|
|
sleep
|
|
end
|
|
end
|
|
th2 = Thread.new do
|
|
sleep 0.1
|
|
q.pop
|
|
end
|
|
sleep 0.1
|
|
th1.raise
|
|
sleep 0.1
|
|
q << :s
|
|
assert_nothing_raised(TimeoutError) do
|
|
timeout(1) { th2.join }
|
|
end
|
|
end
|
|
end
|