---

yaml
---
r: 62551
b: refs/heads/snap-stage3
c: ee06ed2
h: refs/heads/master
i:
  62549: fe7502b
  62547: 47fc83b
  62543: 1aaa83b
v: v3

Author: brson

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: f03c9bd08cde6c83306d91bb07c4810b8b8f13ba
+refs/heads/snap-stage3: ee06ed2bfd233b57c5989696bb723bddf6569622
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/libcore/rt/work_queue.rs

@@ -11,39 +11,48 @@
 use container::Container;
 use option::*;
 use vec::OwnedVector;
+use unstable::sync::{Exclusive, exclusive};
+use cell::Cell;
+use kinds::Owned;
 
 pub struct WorkQueue<T> {
-    priv queue: ~[T]
+    // XXX: Another mystery bug fixed by boxing this lock
+    priv queue: ~Exclusive<~[T]>
 }
 
-pub impl<T> WorkQueue<T> {
+pub impl<T: Owned> WorkQueue<T> {
     fn new() -> WorkQueue<T> {
         WorkQueue {
-            queue: ~[]
+            queue: ~exclusive(~[])
         }
     }
 
     fn push(&mut self, value: T) {
-        self.queue.unshift(value)
+        let value = Cell(value);
+        self.queue.with(|q| q.unshift(value.take()) );
     }
 
     fn pop(&mut self) -> Option<T> {
-        if !self.queue.is_empty() {
-            Some(self.queue.shift())
-        } else {
-            None
+        do self.queue.with |q| {
+            if !q.is_empty() {
+                Some(q.shift())
+            } else {
+                None
+            }
         }
     }
 
     fn steal(&mut self) -> Option<T> {
-        if !self.queue.is_empty() {
-            Some(self.queue.pop())
-        } else {
-            None
+        do self.queue.with |q| {
+            if !q.is_empty() {
+                Some(q.pop())
+            } else {
+                None
+            }
         }
     }
 
     fn is_empty(&self) -> bool {
-        return self.queue.is_empty();
+        self.queue.with_imm(|q| q.is_empty() )
     }
 }