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

Move the receivers out of the ImageCache struct.

Browse source
This commit is contained in:
Ms2ger 2016-03-07 14:29:49 +01:00
parent 9c75ddfe66
commit 1064c3dca0
1 changed files with 10 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

36
components/net/image_cache_thread.rs
View file

@ -18,7 +18,7 @@ use std::fs::File;
use std::io::Read; use std::io::Read;
use std::mem; use std::mem;
use std::sync::Arc; use std::sync::Arc;
use std::sync::mpsc::{Receiver, Sender, channel}; use std::sync::mpsc::{Sender, channel};
use url::Url; use url::Url;
use util::resource_files::resources_dir_path; use util::resource_files::resources_dir_path;
use util::thread::spawn_named; use util::thread::spawn_named;
@ -232,15 +232,8 @@ struct ResourceLoadInfo {
/// Implementation of the image cache /// Implementation of the image cache
struct ImageCache { struct ImageCache {
// Receive commands from clients
cmd_receiver: Receiver<ImageCacheCommand>,
// Receive notifications from the resource thread
progress_receiver: Receiver<ResourceLoadInfo>,
progress_sender: Sender<ResourceLoadInfo>, progress_sender: Sender<ResourceLoadInfo>,
// Receive notifications from the decoder thread pool
decoder_receiver: Receiver<DecoderMsg>,
decoder_sender: Sender<DecoderMsg>, decoder_sender: Sender<DecoderMsg>,
// Worker threads for decoding images. // Worker threads for decoding images.
@ -314,11 +307,8 @@ impl ImageCache {
let (progress_sender, progress_receiver) = channel(); let (progress_sender, progress_receiver) = channel();
let (decoder_sender, decoder_receiver) = channel(); let (decoder_sender, decoder_receiver) = channel();
let mut cache = ImageCache { let mut cache = ImageCache {
cmd_receiver: cmd_receiver,
progress_sender: progress_sender, progress_sender: progress_sender,
progress_receiver: progress_receiver,
decoder_sender: decoder_sender, decoder_sender: decoder_sender,
decoder_receiver: decoder_receiver,
thread_pool: ThreadPool::new(4), thread_pool: ThreadPool::new(4),
pending_loads: AllPendingLoads::new(), pending_loads: AllPendingLoads::new(),
completed_loads: HashMap::new(), completed_loads: HashMap::new(),
@ -330,21 +320,15 @@ impl ImageCache {
let mut exit_sender: Option<IpcSender<()>> = None; let mut exit_sender: Option<IpcSender<()>> = None;
loop { loop {
let result = { let result = select! {
let cmd_receiver = &cache.cmd_receiver; msg = cmd_receiver.recv() => {
let progress_receiver = &cache.progress_receiver; SelectResult::Command(msg.unwrap())
let decoder_receiver = &cache.decoder_receiver; },
msg = decoder_receiver.recv() => {
select! { SelectResult::Decoder(msg.unwrap())
msg = cmd_receiver.recv() => { },
SelectResult::Command(msg.unwrap()) msg = progress_receiver.recv() => {
}, SelectResult::Progress(msg.unwrap())
msg = decoder_receiver.recv() => {
SelectResult::Decoder(msg.unwrap())
},
msg = progress_receiver.recv() => {
SelectResult::Progress(msg.unwrap())
}
} }
}; };