From 56aed8323655769ebd0e6e1bd3c40775308e62a7 Mon Sep 17 00:00:00 2001
From: Ryan Leckey <leckey.ryan@gmail.com>
Date: Sat, 28 Jan 2017 22:40:03 -0800
Subject: Add back RwLock

---
 src/lib.rs | 52 +++++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 41 insertions(+), 11 deletions(-)

(limited to 'src/lib.rs')

diff --git a/src/lib.rs b/src/lib.rs
index 25e2255..9cb8f82 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -15,7 +15,7 @@ mod env;
 mod config;
 
 use std::error::Error;
-use std::sync::{Once, ONCE_INIT};
+use std::sync::{Once, ONCE_INIT, RwLock};
 use std::borrow::Cow;
 
 pub use source::{Source, SourceBuilder};
@@ -27,11 +27,11 @@ pub use value::Value;
 pub use config::Config;
 
 // Global configuration
-static mut CONFIG: Option<Config<'static>> = None;
+static mut CONFIG: Option<RwLock<Config<'static>>> = None;
 static CONFIG_INIT: Once = ONCE_INIT;
 
 // Get the global configuration instance
-pub fn global() -> &'static mut Config<'static> {
+pub fn global() -> &'static mut RwLock<Config<'static>> {
     unsafe {
         CONFIG_INIT.call_once(|| {
             CONFIG = Some(Default::default());
@@ -44,37 +44,67 @@ pub fn global() -> &'static mut Config<'static> {
 pub fn merge<T>(source: T) -> Result<(), Box<Error>>
     where T: SourceBuilder
 {
-    global().merge(source)
+    global().write().unwrap().merge(source)
 }
 
 pub fn set_default<T>(key: &str, value: T) -> Result<(), Box<Error>>
     where T: Into<Value<'static>>
 {
-    global().set_default(key, value)
+    global().write().unwrap().set_default(key, value)
 }
 
 pub fn set<T>(key: &str, value: T) -> Result<(), Box<Error>>
     where T: Into<Value<'static>>
 {
-    global().set(key, value)
+    global().write().unwrap().set(key, value)
 }
 
 pub fn get<'a>(key: &str) -> Option<Cow<'a, Value>> {
-    global().get(key)
+    // TODO(~): Should this panic! or return None with an error message?
+    //          Make an issue if you think it should be an error message.
+    let r = global().read().unwrap();
+
+    let c = &*r;
+
+    // TODO(@rust): Figure out how to not to use unsafe here
+    unsafe {
+        let c: &'static Config = std::mem::transmute(c);
+        c.get(key)
+    }
 }
 
 pub fn get_str<'a>(key: &str) -> Option<Cow<'a, str>> {
-    global().get_str(key)
+    let r = global().read().unwrap();
+
+    unsafe {
+        let c: &'static Config = std::mem::transmute(&*r);
+        c.get_str(key)
+    }
 }
 
 pub fn get_int(key: &str) -> Option<i64> {
-    global().get_int(key)
+    let r = global().read().unwrap();
+
+    unsafe {
+        let c: &'static Config = std::mem::transmute(&*r);
+        c.get_int(key)
+    }
 }
 
 pub fn get_float(key: &str) -> Option<f64> {
-    global().get_float(key)
+    let r = global().read().unwrap();
+
+    unsafe {
+        let c: &'static Config = std::mem::transmute(&*r);
+        c.get_float(key)
+    }
 }
 
 pub fn get_bool(key: &str) -> Option<bool> {
-    global().get_bool(key)
+    let r = global().read().unwrap();
+
+    unsafe {
+        let c: &'static Config = std::mem::transmute(&*r);
+        c.get_bool(key)
+    }
 }
-- 
cgit v1.2.3