summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--lib/thread.rb4
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 6cf7e473d55..30d35c1309e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Aug 30 09:57:50 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+
+ * lib/thread.rb (Queue#pop): fix a race against Thread.wakeup.
+ Patch by Masaki Matsushita <glass.saga at gmail dot com>
+ [Bug #5195] [ruby-dev:44400]
+
Tue Aug 30 09:48:07 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
* cont.c (fiber_entry): fix stack allocation failure on Debian
diff --git a/lib/thread.rb b/lib/thread.rb
index 58c4f6b9e69..09f2d58ecc4 100644
--- a/lib/thread.rb
+++ b/lib/thread.rb
@@ -185,7 +185,9 @@ class Queue
while true
if @que.empty?
raise ThreadError, "queue empty" if non_block
- @waiting.push Thread.current
+ # @waiting.include? check is necessary for avoiding a race against
+ # Thread.wakeup [Bug 5195]
+ @waiting.push Thread.current unless @waiting.include?(Thread.current)
@mutex.sleep
else
return @que.shift