diff options
author | shugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-02-24 07:01:18 +0000 |
---|---|---|
committer | shugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-02-24 07:01:18 +0000 |
commit | 1adef150721a42b9efe97ebc18de535040810e7a (patch) | |
tree | 871d7671561891a833a3381d7d0ee1c1d18fca39 /lib | |
parent | 0fa6a335d10db5a9a717bf9073f7bd6964fc8c85 (diff) | |
download | ruby-1adef150721a42b9efe97ebc18de535040810e7a.tar.gz |
* lib/thread.rb (ConditionVariable#broadcast): use Mutex
instead of Thread.exclusive.
* lib/monitor.rb (MonitorMixin#mon_exit): unset @mon_owner
before calling Mutex#unlock.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11848 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r-- | lib/monitor.rb | 2 | ||||
-rw-r--r-- | lib/thread.rb | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/lib/monitor.rb b/lib/monitor.rb index a40d924726..b556747577 100644 --- a/lib/monitor.rb +++ b/lib/monitor.rb @@ -174,8 +174,8 @@ module MonitorMixin mon_check_owner @mon_count -=1 if @mon_count == 0 - @mon_mutex.unlock @mon_owner = nil + @mon_mutex.unlock end end diff --git a/lib/thread.rb b/lib/thread.rb index 96e7875bea..7dd4b1115d 100644 --- a/lib/thread.rb +++ b/lib/thread.rb @@ -54,6 +54,7 @@ class ConditionVariable # def initialize @waiters = [] + @waiters_mutex = Mutex.new end # @@ -62,7 +63,9 @@ class ConditionVariable def wait(mutex) begin # TODO: mutex should not be used - @waiters.push(Thread.current) + @waiters_mutex.synchronize do + @waiters.push(Thread.current) + end mutex.sleep end end @@ -72,7 +75,7 @@ class ConditionVariable # def signal begin - t = @waiters.shift + t = @waiters_mutex.synchronize { @waiters.shift } t.run if t rescue ThreadError retry @@ -85,7 +88,7 @@ class ConditionVariable def broadcast # TODO: imcomplete waiters0 = nil - Thread.exclusive do + @waiters_mutex.synchronize do waiters0 = @waiters.dup @waiters.clear end |