Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-23 07:13:52 +01:00
Code Issues Projects Releases Packages Wiki Activity

Use external 'threadpool' crate, remove in-tree utility.

Browse source
This commit is contained in:
Corey Farwell 2016-02-27 21:13:08 -05:00
parent e551ea7322
commit 182b9b1e4f
8 changed files with 21 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

1
components/net/Cargo.toml
View file

@ -41,6 +41,7 @@ log = "0.3.5"
mime_guess = "1.6.0"
openssl = "0.7.6"
rustc-serialize = "0.3"
threadpool = "1.0"
time = "0.1.17"
url = {version = "0.5.7", features = ["heap_size"]}
uuid = "0.1.16"

2
components/net/image_cache_thread.rs
View file

@ -19,10 +19,10 @@ use std::io::Read;
use std::mem;
use std::sync::Arc;
use std::sync::mpsc::{Sender, Receiver, channel};
use threadpool::ThreadPool;
use url::Url;
use util::resource_files::resources_dir_path;
use util::thread::spawn_named;
use util::threadpool::ThreadPool;
use webrender_traits;
///

1
components/net/lib.rs
View file

@ -25,6 +25,7 @@ extern crate msg;
extern crate net_traits;
extern crate openssl;
extern crate rustc_serialize;
extern crate threadpool;
extern crate time;
extern crate url;
extern crate util;

6
components/servo/Cargo.lock generated
View file

@ -1280,6 +1280,7 @@ dependencies = [
"openssl 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)",
"plugins 0.0.1",
"rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
"threadpool 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1",
@ -2064,6 +2065,11 @@ dependencies = [
"utf-8 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "threadpool"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "time"
version = "0.1.34"

2
components/util/lib.rs
View file

@ -7,7 +7,6 @@
#![feature(core_intrinsics)]
#![feature(custom_derive)]
#![cfg_attr(feature = "non-geckolib", feature(decode_utf16))]
#![feature(fnbox)]
#![feature(optin_builtin_traits)]
#![feature(plugin)]
#![feature(reflect_marker)]
@ -59,7 +58,6 @@ pub mod resource_files;
pub mod str;
pub mod thread;
pub mod thread_state;
pub mod threadpool;
pub mod tid;
pub mod time;
pub mod vec;

55
components/util/threadpool.rs
View file

@ -1,55 +0,0 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
//! A load-balancing thread pool.
//!
//! This differs in implementation from std::sync::ThreadPool in that each job is
//! up for grabs by any of the child threads in the pool.
//!
//
// This is based on the cargo thread pool.
// https://github.com/rust-lang/cargo/blob/master/src/cargo/util/pool.rs
//
// The only difference is that a normal channel is used instead of a sync_channel.
//
use std::boxed::FnBox;
use std::sync::mpsc::{Receiver, Sender, channel};
use std::sync::{Arc, Mutex};
use thread::spawn_named;
pub struct ThreadPool {
tx: Sender<Box<FnBox() + Send + 'static>>,
}
impl ThreadPool {
pub fn new(threads: u32) -> ThreadPool {
assert!(threads > 0);
let (tx, rx) = channel();
let state = Arc::new(Mutex::new(rx));
for i in 0..threads {
let state = state.clone();
spawn_named(
format!("ThreadPoolWorker {}/{}", i + 1, threads),
move || worker(&*state));
}
return ThreadPool { tx: tx };
fn worker(rx: &Mutex<Receiver<Box<FnBox() + Send + 'static>>>) {
while let Ok(job) = rx.lock().unwrap().recv() {
job.call_box(());
}
}
}
pub fn execute<F>(&self, job: F)
where F: FnOnce() + Send + 'static
{
self.tx.send(Box::new(job)).unwrap();
}
}

6
ports/cef/Cargo.lock generated
View file

@ -1200,6 +1200,7 @@ dependencies = [
"openssl 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)",
"plugins 0.0.1",
"rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
"threadpool 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1",
@ -1951,6 +1952,11 @@ dependencies = [
"utf-8 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "threadpool"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "time"
version = "0.1.34"

6
ports/gonk/Cargo.lock generated
View file

@ -1182,6 +1182,7 @@ dependencies = [
"openssl 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)",
"plugins 0.0.1",
"rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
"threadpool 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1",
@ -1931,6 +1932,11 @@ dependencies = [
"utf-8 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "threadpool"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "time"
version = "0.1.34"