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

Removed FnvHash and transformed the rest to FxHashmap (#39233)

Browse source 
This should be the final PR for the Hash Function series that is
trivial.

Of note: I decided to transform `HashMapTracedValues<Atom,..>` to use
FxBuildHasher. This is likely not going to improve performance as Atom's
already have a unique u32 that is used as the Hash but it safes a few
bytes for the RandomState that is normally in the HashMap.

Signed-off-by: Narfinger <Narfinger@users.noreply.github.com>

Testing: Hash function changes should not change functionality, we
slightly decrease the size and unit tests still work.

Signed-off-by: Narfinger <Narfinger@users.noreply.github.com>
This commit is contained in:
Narfinger 2025-09-10 15:34:54 +02:00 • committed by GitHub
parent 726b456120
commit 84465e7768
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
55 changed files with 211 additions and 202 deletions
Download patch file Download diff file Expand all files Collapse all files

8
components/net/filemanager_thread.rs
View file

@ -2,7 +2,6 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
use std::collections::{HashMap, HashSet};
use std::fs::File;
use std::io::{BufRead, BufReader, Read, Seek, SeekFrom};
use std::ops::Index;
@ -25,6 +24,7 @@ use net_traits::filemanager_thread::{
};
use net_traits::http_percent_encode;
use net_traits::response::{Response, ResponseBody};
use rustc_hash::{FxHashMap, FxHashSet};
use servo_arc::Arc as ServoArc;
use servo_config::pref;
use tokio::sync::mpsc::UnboundedSender as TokioSender;
@ -54,7 +54,7 @@ struct FileStoreEntry {
is_valid_url: AtomicBool,
/// UUIDs of fetch instances that acquired an interest in this file,
/// when the url was still valid.
outstanding_tokens: HashSet<Uuid>,
outstanding_tokens: FxHashSet<Uuid>,
}
#[derive(Clone)]
@ -433,13 +433,13 @@ enum BlobBounds {
/// from FileID to FileStoreEntry which might have different backend implementation.
/// Access to the content is encapsulated as methods of this struct.
struct FileManagerStore {
entries: RwLock<HashMap<Uuid, FileStoreEntry>>,
entries: RwLock<FxHashMap<Uuid, FileStoreEntry>>,
}
impl FileManagerStore {
fn new() -> Self {
FileManagerStore {
entries: RwLock::new(HashMap::new()),
entries: RwLock::new(FxHashMap::default()),
}
}

12
components/net/image_cache.rs
View file

@ -487,12 +487,12 @@ struct ImageCacheStore {
/// Vector (e.g. SVG) images that have been sucessfully loaded and parsed
/// but are yet to be rasterized. Since the same SVG data can be used for
/// rasterizing at different sizes, we use this hasmap to share the data.
vector_images: HashMap<PendingImageId, VectorImageData>,
vector_images: FxHashMap<PendingImageId, VectorImageData>,
/// Vector images for which rasterization at a particular size has started
/// or completed. If completed, the `result` member of `RasterizationTask`
/// contains the rasterized image.
rasterized_vector_images: HashMap<(PendingImageId, DeviceIntSize), RasterizationTask>,
rasterized_vector_images: FxHashMap<(PendingImageId, DeviceIntSize), RasterizationTask>,
/// The placeholder image used when an image fails to load
#[conditional_malloc_size_of]
@ -722,8 +722,8 @@ impl ImageCache for ImageCacheImpl {
store: Arc::new(Mutex::new(ImageCacheStore {
pending_loads: AllPendingLoads::new(),
completed_loads: HashMap::new(),
vector_images: HashMap::new(),
rasterized_vector_images: HashMap::new(),
vector_images: FxHashMap::default(),
rasterized_vector_images: FxHashMap::default(),
placeholder_image: get_placeholder_image(&compositor_api, &rippy_data),
placeholder_url: ServoUrl::parse("chrome://resources/rippy.png").unwrap(),
compositor_api: compositor_api.clone(),
@ -1083,8 +1083,8 @@ impl ImageCache for ImageCacheImpl {
placeholder_image,
placeholder_url,
compositor_api,
vector_images: HashMap::new(),
rasterized_vector_images: HashMap::new(),
vector_images: FxHashMap::default(),
rasterized_vector_images: FxHashMap::default(),
key_cache: KeyCache::new(),
pipeline_id,
})),