Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 06:00:15 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #6570 - Ms2ger:workqueue-sync, r=pcwalton

Browse source 
Require that WorkQueue's QueueData is Sync rather than Send.



<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6570)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-07-07 13:07:31 -06:00
commit c76720d67c
2 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
components/layout/context.rs
View file

@ -129,7 +129,16 @@ pub struct SharedLayoutContext {
pub goal: ReflowGoal,
}
unsafe impl Send for SharedLayoutContext {}
// FIXME(#6569) This implementations is unsound:
// XXX UNSOUND!!! for image_cache_task
// XXX UNSOUND!!! for image_cache_sender
// XXX UNSOUND!!! for constellation_chan
// XXX UNSOUND!!! for layout_chan
// XXX UNSOUND!!! for font_cache_task
// XXX UNSOUND!!! for stylist
// XXX UNSOUND!!! for new_animations_sender
// XXX UNSOUND!!! for canvas_layers_sender
unsafe impl Sync for SharedLayoutContext {}
pub struct LayoutContext<'a> {
pub shared: &'a SharedLayoutContext,

4
components/util/workqueue.rs
View file

@ -93,7 +93,7 @@ fn next_power_of_two(mut v: u32) -> u32 {
v
}
impl<QueueData: Send, WorkData: Send> WorkerThread<QueueData, WorkData> {
impl<QueueData: Sync, WorkData: Send> WorkerThread<QueueData, WorkData> {
/// The main logic. This function starts up the worker and listens for
/// messages.
fn start(&mut self) {
@ -232,7 +232,7 @@ pub struct WorkQueue<QueueData: 'static, WorkData: 'static> {
work_count: usize,
}
impl<QueueData: Send, WorkData: Send> WorkQueue<QueueData, WorkData> {
impl<QueueData: Sync, WorkData: Send> WorkQueue<QueueData, WorkData> {
/// Creates a new work queue and spawns all the threads associated with
/// it.
pub fn new(task_name: &'static str,