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

prefs: Make the preferences be guarded by a RwLock instead of a Mutex

Browse source 
This should reduce unnecessary locks that happen when we read preferences.
This commit is contained in:
Emilio Cobos Álvarez 2016-07-05 13:11:50 -07:00
parent d99ff8d857
commit 2e8f2302cd
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
components/util/prefs.rs
View file

@ -11,12 +11,12 @@ use std::collections::HashMap;
use std::fs::File; use std::fs::File;
use std::io::{Read, Write, stderr}; use std::io::{Read, Write, stderr};
use std::path::PathBuf; use std::path::PathBuf;
use std::sync::{Arc, Mutex}; use std::sync::{Arc, RwLock};
lazy_static! { lazy_static! {
pub static ref PREFS: Preferences = { pub static ref PREFS: Preferences = {
let prefs = read_prefs().unwrap_or_else(|_| HashMap::new()); let prefs = read_prefs().ok().unwrap_or_else(HashMap::new);
Preferences(Arc::new(Mutex::new(prefs))) Preferences(Arc::new(RwLock::new(prefs)))
}; };
} }
@ -207,15 +207,15 @@ fn read_prefs() -> Result<HashMap<String, Pref>, ()> {
read_prefs_from_file(file) read_prefs_from_file(file)
} }
pub struct Preferences(Arc<Mutex<HashMap<String, Pref>>>); pub struct Preferences(Arc<RwLock<HashMap<String, Pref>>>);
impl Preferences { impl Preferences {
pub fn get(&self, name: &str) -> Arc<PrefValue> { pub fn get(&self, name: &str) -> Arc<PrefValue> {
self.0.lock().unwrap().get(name).map_or(Arc::new(PrefValue::Missing), |x| x.value().clone()) self.0.read().unwrap().get(name).map_or(Arc::new(PrefValue::Missing), |x| x.value().clone())
} }
pub fn cloned(&self) -> HashMap<String, Pref> { pub fn cloned(&self) -> HashMap<String, Pref> {
self.0.lock().unwrap().clone() self.0.read().unwrap().clone()
} }
pub fn is_mozbrowser_enabled(&self) -> bool { pub fn is_mozbrowser_enabled(&self) -> bool {
@ -223,7 +223,7 @@ impl Preferences {
} }
pub fn set(&self, name: &str, value: PrefValue) { pub fn set(&self, name: &str, value: PrefValue) {
let mut prefs = self.0.lock().unwrap(); let mut prefs = self.0.write().unwrap();
if let Some(pref) = prefs.get_mut(name) { if let Some(pref) = prefs.get_mut(name) {
pref.set(value); pref.set(value);
return; return;
@ -232,7 +232,7 @@ impl Preferences {
} }
pub fn reset(&self, name: &str) -> Arc<PrefValue> { pub fn reset(&self, name: &str) -> Arc<PrefValue> {
let mut prefs = self.0.lock().unwrap(); let mut prefs = self.0.write().unwrap();
let result = match prefs.get_mut(name) { let result = match prefs.get_mut(name) {
None => return Arc::new(PrefValue::Missing), None => return Arc::new(PrefValue::Missing),
Some(&mut Pref::NoDefault(_)) => Arc::new(PrefValue::Missing), Some(&mut Pref::NoDefault(_)) => Arc::new(PrefValue::Missing),
@ -249,7 +249,7 @@ impl Preferences {
pub fn reset_all(&self) { pub fn reset_all(&self) {
let names = { let names = {
self.0.lock().unwrap().keys().cloned().collect::<Vec<String>>() self.0.read().unwrap().keys().cloned().collect::<Vec<String>>()
}; };
for name in names.iter() { for name in names.iter() {
self.reset(name); self.reset(name);
@ -257,6 +257,6 @@ impl Preferences {
} }
pub fn extend(&self, extension: HashMap<String, Pref>) { pub fn extend(&self, extension: HashMap<String, Pref>) {
self.0.lock().unwrap().extend(extension); self.0.write().unwrap().extend(extension);
} }
} }