summaryrefslogtreecommitdiff
path: root/lib/monitor.rb
diff options
context:
space:
mode:
authorshugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2001-04-02 05:27:49 +0000
committershugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2001-04-02 05:27:49 +0000
commit619aa50e25c5cc37222cbf72159eac20c9752cf2 (patch)
tree00ec4ee4ed228ad99b923568d2ec1f0985913300 /lib/monitor.rb
parent8eeaf69e52b648ff8d7564cd991db7409a43a941 (diff)
* lib/monitor.rb (wait): fix timeout support.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1302 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/monitor.rb')
-rw-r--r--lib/monitor.rb22
1 files changed, 13 insertions, 9 deletions
diff --git a/lib/monitor.rb b/lib/monitor.rb
index d36546a..721c51a 100644
--- a/lib/monitor.rb
+++ b/lib/monitor.rb
@@ -69,6 +69,15 @@ module MonitorMixin
raise ThreadError, "current thread not owner"
end
+ if timeout
+ ct = Thread.current
+ timeout_thread = Thread.start {
+ Thread.pass
+ sleep(timeout)
+ ct.raise(Timeout.new)
+ }
+ end
+
Thread.critical = true
count = @monitor.mon_count
@monitor.mon_count = 0
@@ -80,23 +89,18 @@ module MonitorMixin
end
t.wakeup if t
@waiters.push(Thread.current)
-
- if timeout
- t = Thread.current
- timeout_thread = Thread.start {
- sleep(timeout)
- t.raise(Timeout.new)
- }
- end
+
begin
Thread.stop
rescue Timeout
- @waiters.delete(Thread.current)
ensure
Thread.critical = true
if timeout && timeout_thread.alive?
Thread.kill(timeout_thread)
end
+ if @waiters.include?(Thread.current) # interrupted?
+ @waiters.delete(Thread.current)
+ end
while @monitor.mon_owner &&
@monitor.mon_owner != Thread.current
@monitor.mon_waiting_queue.push(Thread.current)