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

auto merge of #1977 : mbrubeck/servo/task-name, r=jdm

Browse source 
Now with 100% less breaking everything.  (An earlier version of this patch in #1948 switched WorkQueue from native tasks to green tasks, which I missed in testing because we don't spawn new layout threads by default on 1- or 2-core machines.)
This commit is contained in:
bors-servo 2014-03-25 14:13:41 -04:00
commit a8e1059f44
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/components/main/layout/layout_task.rs
View file

@ -290,7 +290,7 @@ impl LayoutTask {
let local_image_cache = MutexArc::new(LocalImageCache(image_cache_task.clone()));
let screen_size = Size2D(Au(0), Au(0));
let parallel_traversal = if opts.layout_threads != 1 {
Some(WorkQueue::new(opts.layout_threads, ptr::mut_null()))
Some(WorkQueue::new("LayoutWorker", opts.layout_threads, ptr::mut_null()))
} else {
None
};

7
src/components/util/workqueue.rs
View file

@ -15,6 +15,7 @@ use std::rand::{Rng, XorShiftRng};
use std::rand;
use std::sync::atomics::{AtomicUint, SeqCst};
use std::sync::deque::{Abort, BufferPool, Data, Empty, Stealer, Worker};
use std::task::TaskOpts;
/// A unit of work.
///
@ -200,7 +201,7 @@ pub struct WorkQueue<QUD,WUD> {
impl<QUD:Send,WUD:Send> WorkQueue<QUD,WUD> {
/// Creates a new work queue and spawns all the threads associated with
/// it.
pub fn new(thread_count: uint, user_data: QUD) -> WorkQueue<QUD,WUD> {
pub fn new(task_name: &'static str, thread_count: uint, user_data: QUD) -> WorkQueue<QUD,WUD> {
// Set up data structures.
let (supervisor_port, supervisor_chan) = Chan::new();
let (mut infos, mut threads) = (~[], ~[]);
@ -235,7 +236,9 @@ impl<QUD:Send,WUD:Send> WorkQueue<QUD,WUD> {
// Spawn threads.
for thread in threads.move_iter() {
native::task::spawn(proc() {
let mut opts = TaskOpts::new();
opts.name = Some(task_name.into_maybe_owned());
native::task::spawn_opts(opts, proc() {
let mut thread = thread;
thread.start()
})