summaryrefslogtreecommitdiff
path: root/lib/monitor.rb
diff options
context:
space:
mode:
authorshugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-11-05 00:15:17 +0000
committershugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-11-05 00:15:17 +0000
commitd61ba0cec68ba34bf8e044e7d111637705c7c34e (patch)
tree9f17c1625ded7d796a9191d58cf893060deb746e /lib/monitor.rb
parentd193b90d54419e253b48aff340887899230d6e63 (diff)
* lib/monitor.rb: revert to the previous revision.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4898 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/monitor.rb')
-rw-r--r--lib/monitor.rb33
1 files changed, 13 insertions, 20 deletions
diff --git a/lib/monitor.rb b/lib/monitor.rb
index c7f610c..5eb7bb4 100644
--- a/lib/monitor.rb
+++ b/lib/monitor.rb
@@ -130,14 +130,10 @@ module MonitorMixin
t.wakeup if t
@waiters.push(Thread.current)
- preserved_exceptions = []
- while true
- begin
- Thread.stop
- rescue Timeout
- rescue Exception => exception
- preserved_exceptions << exception
- end
+ begin
+ Thread.stop
+ rescue Timeout
+ ensure
Thread.critical = true
if timeout && timeout_thread.alive?
Thread.kill(timeout_thread)
@@ -145,17 +141,15 @@ module MonitorMixin
if @waiters.include?(Thread.current) # interrupted?
@waiters.delete(Thread.current)
end
-
- break if @monitor.mon_owner.nil? or @monitor.mon_owner == Thread.current
- @monitor.mon_waiting_queue.delete(Thread.current)
- @monitor.mon_waiting_queue.push(Thread.current)
- end
- @monitor.mon_owner = Thread.current
- @monitor.mon_count = count
- Thread.critical = false
-
- unless preserved_exceptions.empty?
- raise preserved_exceptions.first
+ while @monitor.mon_owner &&
+ @monitor.mon_owner != Thread.current
+ @monitor.mon_waiting_queue.push(Thread.current)
+ Thread.stop
+ Thread.critical = true
+ end
+ @monitor.mon_owner = Thread.current
+ @monitor.mon_count = count
+ Thread.critical = false
end
end
@@ -238,7 +232,6 @@ module MonitorMixin
def mon_enter
Thread.critical = true
while mon_owner != nil && mon_owner != Thread.current
- mon_entering_queue.delete(Thread.current)
mon_entering_queue.push(Thread.current)
Thread.stop
Thread.critical = true