summaryrefslogtreecommitdiff
path: root/lib/monitor.rb
diff options
context:
space:
mode:
authornahi <nahi@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-10-20 16:14:25 +0000
committernahi <nahi@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-10-20 16:14:25 +0000
commit69743fbd85b659601174bff9fb61abc8c662c13b (patch)
treec06507b2a51f4afa05bf543ef97af6a0a23e58f4 /lib/monitor.rb
parent3b33b909d458f4333c50337f36be4abc1f038b47 (diff)
* lib/monitor.rb (MonitorMixin.mon_release): ensure the scheduled
thread to be alive when a thread is releasing a monitor. #2240 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@25420 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/monitor.rb')
-rw-r--r--lib/monitor.rb10
1 files changed, 7 insertions, 3 deletions
diff --git a/lib/monitor.rb b/lib/monitor.rb
index 4c146c8086..9158f9fb32 100644
--- a/lib/monitor.rb
+++ b/lib/monitor.rb
@@ -288,11 +288,15 @@ module MonitorMixin
@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)