Skip to content
Permalink
Browse files

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

This should reduce unnecessary locks that happen when we read preferences.
  • Loading branch information
emilio committed Jul 5, 2016
1 parent d99ff8d commit 2e8f2302cdb4a25e21631f7f601f3c611643181e
Showing with 10 additions and 10 deletions.
  1. +10 −10 components/util/prefs.rs
@@ -11,12 +11,12 @@ use std::collections::HashMap;
use std::fs::File;
use std::io::{Read, Write, stderr};
use std::path::PathBuf;
use std::sync::{Arc, Mutex};
use std::sync::{Arc, RwLock};

lazy_static! {
pub static ref PREFS: Preferences = {
let prefs = read_prefs().unwrap_or_else(|_| HashMap::new());
Preferences(Arc::new(Mutex::new(prefs)))
let prefs = read_prefs().ok().unwrap_or_else(HashMap::new);
Preferences(Arc::new(RwLock::new(prefs)))
};
}

@@ -207,23 +207,23 @@ fn read_prefs() -> Result<HashMap<String, Pref>, ()> {
read_prefs_from_file(file)
}

pub struct Preferences(Arc<Mutex<HashMap<String, Pref>>>);
pub struct Preferences(Arc<RwLock<HashMap<String, Pref>>>);

impl Preferences {
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> {
self.0.lock().unwrap().clone()
self.0.read().unwrap().clone()
}

pub fn is_mozbrowser_enabled(&self) -> bool {
self.get("dom.mozbrowser.enabled").as_boolean().unwrap_or(false)
}

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) {
pref.set(value);
return;
@@ -232,7 +232,7 @@ impl Preferences {
}

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) {
None => return Arc::new(PrefValue::Missing),
Some(&mut Pref::NoDefault(_)) => Arc::new(PrefValue::Missing),
@@ -249,14 +249,14 @@ impl Preferences {

pub fn reset_all(&self) {
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() {
self.reset(name);
}
}

pub fn extend(&self, extension: HashMap<String, Pref>) {
self.0.lock().unwrap().extend(extension);
self.0.write().unwrap().extend(extension);
}
}

0 comments on commit 2e8f230

Please sign in to comment.
You can’t perform that action at this time.