nahi	2009-10-21 01:14:25 +0900 (Wed, 21 Oct 2009)

  New Revision: 25420

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=25420

  Log:
    * lib/monitor.rb (MonitorMixin.mon_release): ensure the scheduled
              thread to be alive when a thread is releasing a monitor. #2240

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/lib/monitor.rb
    branches/ruby_1_8/test/monitor/test_monitor.rb

Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 25419)
+++ ruby_1_8/ChangeLog	(revision 25420)
@@ -1,3 +1,8 @@
+Wed Oct 21 01:19:56 2009  NAKAMURA, Hiroshi  <nahi@r...>
+
+	* lib/monitor.rb (MonitorMixin.mon_release): ensure the scheduled
+	  thread to be alive when a thread is releasing a monitor. #2240
+
 Wed Oct 21 00:28:52 2009  NAKAMURA, Hiroshi  <nahi@r...>
 
 	* lib/webrick/httpauth/digestauth.rb: typo in exception message fixed.
Index: ruby_1_8/lib/monitor.rb
===================================================================
--- ruby_1_8/lib/monitor.rb	(revision 25419)
+++ ruby_1_8/lib/monitor.rb	(revision 25420)
@@ -288,11 +288,15 @@
     @mon_owner = Thread.current
   end
 
+  # mon_release requires Thread.critical == true
   def mon_release
     @mon_owner = nil
-    t = @mon_waiting_queue.shift
-    t = @mon_entering_queue.shift unless t
-    t.wakeup if t
+    while t = @mon_waiting_queue.shift || @mon_entering_queue.shift
+      if t.alive?
+        t.wakeup
+        return
+      end
+    end
   end
 
   def mon_enter_for_cond(count)
Index: ruby_1_8/test/monitor/test_monitor.rb
===================================================================
--- ruby_1_8/test/monitor/test_monitor.rb	(revision 25419)
+++ ruby_1_8/test/monitor/test_monitor.rb	(revision 25420)
@@ -54,6 +54,32 @@
     assert_equal((1..10).to_a, ary)
   end
 
+  def test_killed_thread_in_synchronize
+    ary = []
+    queue = Queue.new
+    t1 = Thread.start {
+      queue.pop
+      @monitor.synchronize {
+        ary << :t1
+      }
+    }
+    t2 = Thread.start {
+      queue.pop
+      @monitor.synchronize {
+        ary << :t2
+      }
+    }
+    @monitor.synchronize do
+      queue.enq(nil)
+      queue.enq(nil)
+      assert_equal([], ary)
+      t1.kill
+      t2.kill
+      ary << :main
+    end
+    assert_equal([:main], ary)
+  end
+
   def test_try_enter
     queue1 = Queue.new
     queue2 = Queue.new
@@ -94,7 +120,10 @@
       assert_equal(true, result1)
       assert_equal("bar", a)
     end
+  end
 
+  def test_timedwait
+    cond = @monitor.new_cond
     b = "foo"
     queue2 = Queue.new
     Thread.start do

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/