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

Use thread pool to decode image (#31517)

Browse source 
* feat: do not spawn dedicated thread to decode image

* fix: change comment to docstring

Co-authored-by: Taym Haddadi <haddadi.taym@gmail.com>

---------

Co-authored-by: Taym Haddadi <haddadi.taym@gmail.com>
This commit is contained in:
eri 2024-03-07 17:12:45 +01:00 • committed by GitHub
parent 6005049d88
commit 3837fe00ad
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
components/net/image_cache.rs
View file

@ -4,8 +4,8 @@
use std::collections::hash_map::Entry::{Occupied, Vacant}; use std::collections::hash_map::Entry::{Occupied, Vacant};
use std::collections::HashMap; use std::collections::HashMap;
use std::mem;
use std::sync::{Arc, Mutex}; use std::sync::{Arc, Mutex};
use std::{mem, thread};
use embedder_traits::resources::{self, Resource}; use embedder_traits::resources::{self, Resource};
use imsz::imsz_from_reader; use imsz::imsz_from_reader;
@ -25,6 +25,8 @@ use servo_url::{ImmutableOrigin, ServoUrl};
use webrender_api::units::DeviceIntSize; use webrender_api::units::DeviceIntSize;
use webrender_api::{ImageData, ImageDescriptor, ImageDescriptorFlags, ImageFormat}; use webrender_api::{ImageData, ImageDescriptor, ImageDescriptorFlags, ImageFormat};
use crate::resource_thread::CoreResourceThreadPool;
/// ///
/// TODO(gw): Remaining work on image cache: /// TODO(gw): Remaining work on image cache:
/// * Make use of the prefetch support in various parts of the code. /// * Make use of the prefetch support in various parts of the code.
@ -415,6 +417,9 @@ impl ImageCacheStore {
pub struct ImageCacheImpl { pub struct ImageCacheImpl {
store: Arc<Mutex<ImageCacheStore>>, store: Arc<Mutex<ImageCacheStore>>,
/// Thread pool for image decoding
thread_pool: CoreResourceThreadPool,
} }
impl ImageCache for ImageCacheImpl { impl ImageCache for ImageCacheImpl {
@ -431,6 +436,7 @@ impl ImageCache for ImageCacheImpl {
placeholder_url: ServoUrl::parse("chrome://resources/rippy.png").unwrap(), placeholder_url: ServoUrl::parse("chrome://resources/rippy.png").unwrap(),
webrender_api: webrender_api, webrender_api: webrender_api,
})), })),
thread_pool: CoreResourceThreadPool::new(16),
} }
} }
@ -634,7 +640,7 @@ impl ImageCache for ImageCacheImpl {
}; };
let local_store = self.store.clone(); let local_store = self.store.clone();
thread::spawn(move || { self.thread_pool.spawn(move || {
let msg = decode_bytes_sync(key, &*bytes, cors_status); let msg = decode_bytes_sync(key, &*bytes, cors_status);
debug!("Image decoded"); debug!("Image decoded");
local_store.lock().unwrap().handle_decoder(msg); local_store.lock().unwrap().handle_decoder(msg);