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

Use Vec for SimpleHashCache::entries.

Browse source
This commit is contained in:
Ms2ger 2014-05-07 12:23:53 +02:00
parent 5300846f33
commit aa2866a22c
1 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/components/util/cache.rs
View file

@ -6,7 +6,6 @@ use collections::HashMap;
use rand; use rand;
use rand::Rng; use rand::Rng;
use std::hash::{Hash, sip}; use std::hash::{Hash, sip};
use std::slice;
use std::slice::Items; use std::slice::Items;
#[cfg(test)] #[cfg(test)]
@ -179,7 +178,7 @@ impl<K: Clone + Eq, V: Clone> Cache<K,V> for LRUCache<K,V> {
} }
pub struct SimpleHashCache<K,V> { pub struct SimpleHashCache<K,V> {
entries: ~[Option<(K,V)>], entries: Vec<Option<(K,V)>>,
k0: u64, k0: u64,
k1: u64, k1: u64,
} }
@ -188,7 +187,7 @@ impl<K:Clone+Eq+Hash,V:Clone> SimpleHashCache<K,V> {
pub fn new(cache_size: uint) -> SimpleHashCache<K,V> { pub fn new(cache_size: uint) -> SimpleHashCache<K,V> {
let mut r = rand::task_rng(); let mut r = rand::task_rng();
SimpleHashCache { SimpleHashCache {
entries: slice::from_elem(cache_size, None), entries: Vec::from_elem(cache_size, None),
k0: r.gen(), k0: r.gen(),
k1: r.gen(), k1: r.gen(),
} }
@ -207,8 +206,8 @@ impl<K:Clone+Eq+Hash,V:Clone> SimpleHashCache<K,V> {
#[inline] #[inline]
pub fn find_equiv<'a,Q:Hash+Equiv<K>>(&'a self, key: &Q) -> Option<&'a V> { pub fn find_equiv<'a,Q:Hash+Equiv<K>>(&'a self, key: &Q) -> Option<&'a V> {
let bucket_index = self.bucket_for_key(key); let bucket_index = self.bucket_for_key(key);
match self.entries[bucket_index] { match self.entries.get(bucket_index) {
Some((ref existing_key, ref value)) if key.equiv(existing_key) => Some(value), &Some((ref existing_key, ref value)) if key.equiv(existing_key) => Some(value),
_ => None, _ => None,
} }
} }
@ -217,13 +216,13 @@ impl<K:Clone+Eq+Hash,V:Clone> SimpleHashCache<K,V> {
impl<K:Clone+Eq+Hash,V:Clone> Cache<K,V> for SimpleHashCache<K,V> { impl<K:Clone+Eq+Hash,V:Clone> Cache<K,V> for SimpleHashCache<K,V> {
fn insert(&mut self, key: K, value: V) { fn insert(&mut self, key: K, value: V) {
let bucket_index = self.bucket_for_key(&key); let bucket_index = self.bucket_for_key(&key);
self.entries[bucket_index] = Some((key, value)) *self.entries.get_mut(bucket_index) = Some((key, value))
} }
fn find(&mut self, key: &K) -> Option<V> { fn find(&mut self, key: &K) -> Option<V> {
let bucket_index = self.bucket_for_key(key); let bucket_index = self.bucket_for_key(key);
match self.entries[bucket_index] { match self.entries.get(bucket_index) {
Some((ref existing_key, ref value)) if existing_key == key => Some((*value).clone()), &Some((ref existing_key, ref value)) if existing_key == key => Some((*value).clone()),
_ => None, _ => None,
} }
} }