Skip to content

Commit ee06ed2

Browse files
committed
core::rt: Put a lock on the work queue
1 parent f03c9bd commit ee06ed2

File tree

1 file changed

+22
-13
lines changed

1 file changed

+22
-13
lines changed

src/libcore/rt/work_queue.rs

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,39 +11,48 @@
1111
use container::Container;
1212
use option::*;
1313
use vec::OwnedVector;
14+
use unstable::sync::{Exclusive, exclusive};
15+
use cell::Cell;
16+
use kinds::Owned;
1417

1518
pub struct WorkQueue<T> {
16-
priv queue: ~[T]
19+
// XXX: Another mystery bug fixed by boxing this lock
20+
priv queue: ~Exclusive<~[T]>
1721
}
1822

19-
pub impl<T> WorkQueue<T> {
23+
pub impl<T: Owned> WorkQueue<T> {
2024
fn new() -> WorkQueue<T> {
2125
WorkQueue {
22-
queue: ~[]
26+
queue: ~exclusive(~[])
2327
}
2428
}
2529

2630
fn push(&mut self, value: T) {
27-
self.queue.unshift(value)
31+
let value = Cell(value);
32+
self.queue.with(|q| q.unshift(value.take()) );
2833
}
2934

3035
fn pop(&mut self) -> Option<T> {
31-
if !self.queue.is_empty() {
32-
Some(self.queue.shift())
33-
} else {
34-
None
36+
do self.queue.with |q| {
37+
if !q.is_empty() {
38+
Some(q.shift())
39+
} else {
40+
None
41+
}
3542
}
3643
}
3744

3845
fn steal(&mut self) -> Option<T> {
39-
if !self.queue.is_empty() {
40-
Some(self.queue.pop())
41-
} else {
42-
None
46+
do self.queue.with |q| {
47+
if !q.is_empty() {
48+
Some(q.pop())
49+
} else {
50+
None
51+
}
4352
}
4453
}
4554

4655
fn is_empty(&self) -> bool {
47-
return self.queue.is_empty();
56+
self.queue.with_imm(|q| q.is_empty() )
4857
}
4958
}

0 commit comments

Comments
 (0)