summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-09-12 06:49:29 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-09-12 06:49:29 +0000
commite3624857f6bf738ba22d2f94071614dd2ae0d7a1 (patch)
treebdb087fe4944dfb298abadca570076a24fae6946
parent416695adffe7d7f802cc64dcb0ed65f66cfb0d25 (diff)
* test/thread/test_thread.rb (test_local_barrier), test/thread/lbtest.rb: test for [ruby-dev:30653].
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@13431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rwxr-xr-xtest/thread/lbtest.rb51
-rw-r--r--test/thread/test_thread.rb14
2 files changed, 65 insertions, 0 deletions
diff --git a/test/thread/lbtest.rb b/test/thread/lbtest.rb
new file mode 100755
index 0000000..10bb901
--- /dev/null
+++ b/test/thread/lbtest.rb
@@ -0,0 +1,51 @@
+#! /usr/bin/ruby
+require 'thread'
+
+class LocalBarrier
+ def initialize(n)
+ @wait = Queue.new
+ @done = Queue.new
+ @keeper = begin_keeper(n)
+ end
+
+ def sync
+ @done.push(true)
+ @wait.pop
+ end
+
+ def join
+ @keeper.join
+ end
+
+ private
+ def begin_keeper(n)
+ Thread.start do
+ n.times do
+ @done.pop
+ end
+ n.times do
+ @wait.push(true)
+ end
+ end
+ end
+end
+
+n = 10
+
+lb = LocalBarrier.new(n)
+
+(n - 1).times do |i|
+ Thread.start do
+ sleep((rand(n) + 1) / 10.0)
+ puts "#{i}: done"
+ lb.sync
+ puts "#{i}: cont"
+ end
+end
+
+lb.sync
+puts "#{n-1}: done"
+
+# lb.join # leaving waiting threads.
+
+puts "exit."
diff --git a/test/thread/test_thread.rb b/test/thread/test_thread.rb
index abdcebf..44ae3b3 100644
--- a/test/thread/test_thread.rb
+++ b/test/thread/test_thread.rb
@@ -1,3 +1,4 @@
+# -*- ruby-indent-level: 4 -*-
require 'thread'
require 'test/unit'
@@ -63,5 +64,18 @@ class TC_Thread < Test::Unit::TestCase
assert_raises(Interrupt) { thread.value }
assert(locked)
end
+
+ def test_local_barrier
+ dir = File.dirname(__FILE__)
+ lbtest = File.join(dir, "lbtest.rb")
+ $:.unshift File.join(File.dirname(dir), 'ruby')
+ require 'envutil'
+ $:.shift
+ 10.times {
+ result = `#{EnvUtil.rubybin} #{lbtest}`
+ assert(!$?.coredump?, '[ruby-dev:30653]')
+ assert_equal("exit.", result[/.*\Z/], '[ruby-dev:30653]')
+ }
+ end
end