min
/
boring2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switch to real mutex for init.

This commit is contained in:
Steven Fackler 2013-12-29 09:29:49 -07:00
parent 70483c1a0c
commit 4d7aa58680
1 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
ssl/mod.rs
View File

@ -1,10 +1,9 @@
use std::cast; use std::cast;
use std::libc::{c_int, c_void, c_char}; use std::libc::{c_int, c_void, c_char};
use std::ptr; use std::ptr;
use std::task; use std::sync::atomics::{AtomicUint, INIT_ATOMIC_UINT, Acquire, Release, SeqCst};
use std::sync::atomics::{AtomicBool, INIT_ATOMIC_BOOL, AtomicUint, use std::unstable::finally::Finally;
INIT_ATOMIC_UINT, Acquire, Release, SeqCst}; use std::unstable::mutex::{Mutex, MUTEX_INIT};
use std::unstable::mutex::Mutex;
use std::io::{Stream, Reader, Writer, Decorator}; use std::io::{Stream, Reader, Writer, Decorator};
use std::vec; use std::vec;
@ -15,8 +14,8 @@ mod ffi;
#[cfg(test)] #[cfg(test)]
mod tests; mod tests;
static mut STARTED_INIT: AtomicBool = INIT_ATOMIC_BOOL; static mut INIT_LOCK: Mutex = MUTEX_INIT;
static mut FINISHED_INIT: AtomicBool = INIT_ATOMIC_BOOL; static mut INITIALIZED: bool = false;
static mut VERIFY_IDX: AtomicUint = INIT_ATOMIC_UINT; static mut VERIFY_IDX: AtomicUint = INIT_ATOMIC_UINT;
@ -25,26 +24,28 @@ static mut MUTEXES: AtomicUint = INIT_ATOMIC_UINT;
fn init() { fn init() {
unsafe { unsafe {
if STARTED_INIT.swap(true, Acquire) { INIT_LOCK.lock();
while !FINISHED_INIT.load(Release) { (|| {
task::deschedule(); if INITIALIZED {
return;
} }
return;
}
ffi::SSL_library_init(); ffi::SSL_library_init();
let verify_idx = ffi::SSL_CTX_get_ex_new_index(0, ptr::null(), None, let verify_idx = ffi::SSL_CTX_get_ex_new_index(0, ptr::null(), None,
None, None); None, None);
assert!(verify_idx >= 0); assert!(verify_idx >= 0);
VERIFY_IDX.store(verify_idx as uint, Release); VERIFY_IDX.store(verify_idx as uint, Release);
let num_locks = ffi::CRYPTO_num_locks(); let num_locks = ffi::CRYPTO_num_locks();
let mutexes = ~vec::from_fn(num_locks as uint, |_| Mutex::new()); let mutexes = ~vec::from_fn(num_locks as uint, |_| Mutex::new());
MUTEXES.store(cast::transmute(mutexes), Release); MUTEXES.store(cast::transmute(mutexes), Release);
ffi::CRYPTO_set_locking_callback(locking_function); ffi::CRYPTO_set_locking_callback(locking_function);
FINISHED_INIT.store(true, Release); INITIALIZED = true;
}).finally(|| {
INIT_LOCK.unlock();
})
} }
} }