---

yaml
---
r: 50001
b: refs/heads/auto
c: 5af5766
h: refs/heads/master
i:
  49999: 5e4fb34
v: v3

Author: brson

[refs]

@@ -14,5 +14,5 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 044703435ba7e1338456f7a83393eb2c6fecf238
+refs/heads/auto: 5af5766512b0e90a3a076a09b35286aca332e48e
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167

branches/auto/src/libcore/rt/mod.rs

@@ -46,20 +46,10 @@ mod context;
 mod thread;
 pub mod env;
 
-pub fn initialize() {
-    unsafe { rust_initialize_global_state(); }
-    extern {
-        fn rust_initialize_global_state();
-    }
-}
-
 pub fn start(main: *u8, _argc: int, _argv: *c_char, _crate_map: *u8) -> int {
     use self::sched::{Scheduler, Task};
     use self::uvio::UvEventLoop;
 
-    // XXX: Would rather do this lazily in Scheduler
-    initialize();
-
     let loop_ = ~UvEventLoop::new();
     let mut sched = ~Scheduler::new(loop_);
     let main_task = ~do Task::new(&mut sched.stack_pool) {

branches/auto/src/libcore/rt/sched.rs

@@ -71,6 +71,13 @@ enum CleanupJob {
 pub impl Scheduler {
 
     static fn new(event_loop: ~EventLoopObject) -> Scheduler {
+
+        // Lazily initialize the global state, currently the scheduler TLS key
+        unsafe { rust_initialize_global_state(); }
+        extern {
+            fn rust_initialize_global_state();
+        }
+
         Scheduler {
             event_loop: event_loop,
             task_queue: WorkQueue::new(),

branches/auto/src/rt/rust_builtin.cpp

@@ -889,7 +889,6 @@ rust_call_nullary_fn(nullary_fn f) {
     f();
 }
 
-
 #ifndef _WIN32
 pthread_key_t sched_key;
 #else
@@ -901,16 +900,26 @@ rust_get_sched_tls_key() {
     return &sched_key;
 }
 
+// Initialize the global state required by the new scheduler
 extern "C" CDECL void
 rust_initialize_global_state() {
 
+    static lock_and_signal init_lock;
+    static bool initialized = false;
+
+    scoped_lock with(init_lock);
+
+    if (!initialized) {
+
 #ifndef _WIN32
-    assert(!pthread_key_create(&sched_key, NULL));
+        assert(!pthread_key_create(&sched_key, NULL));
 #else
-    sched_key = TlsAlloc();
-    assert(sched_key != TLS_OUT_OF_INDEXES);
+        sched_key = TlsAlloc();
+        assert(sched_key != TLS_OUT_OF_INDEXES);
 #endif
 
+        initialized = true;
+    }
 }
 
 //