---

yaml
---
r: 73301
b: refs/heads/dist-snap
c: 86ba457
h: refs/heads/master
i:
  73299: 13ff7bf
v: v3

Author: brson

[refs]

@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
 refs/heads/incoming: b50030718cf28f2a5a81857a26b57442734fe854
-refs/heads/dist-snap: f59fcd5d5f7ba94f7c705eb2c081760dd2213067
+refs/heads/dist-snap: 86ba4573498ef251933fcc784d513c7586dfaae1
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/libcore/rt/local_sched.rs

@@ -23,6 +23,16 @@ use unstable::finally::Finally;
 
 #[cfg(test)] use rt::uv::uvio::UvEventLoop;
 
+/// Initialize the TLS key. Other ops will fail if this isn't executed first.
+pub fn init_tls_key() {
+    unsafe {
+        rust_initialize_rt_tls_key();
+        extern {
+            fn rust_initialize_rt_tls_key();
+        }
+    }
+}
+
 /// Give the Scheduler to thread-local storage
 pub fn put(sched: ~Scheduler) {
     unsafe {

branches/dist-snap/src/libcore/rt/sched.rs

@@ -64,11 +64,8 @@ pub impl Scheduler {
 
     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();
-        }
+        // Lazily initialize the scheduler TLS key
+        local_sched::init_tls_key();
 
         Scheduler {
             event_loop: event_loop,

branches/dist-snap/src/rt/rust_builtin.cpp

@@ -840,9 +840,9 @@ rust_get_rt_tls_key() {
     return &rt_key;
 }
 
-// Initialize the global state required by the new scheduler
+// Initialize the TLS key used by the new scheduler
 extern "C" CDECL void
-rust_initialize_global_state() {
+rust_initialize_rt_tls_key() {
 
     static lock_and_signal init_lock;
     static bool initialized = false;

branches/dist-snap/src/rt/rustrt.def.in

@@ -222,7 +222,7 @@ rust_uv_ip4_addrp
 rust_uv_ip6_addrp
 rust_uv_free_ip4_addr
 rust_uv_free_ip6_addr
-rust_initialize_global_state
+rust_initialize_rt_tls_key
 rust_dbg_next_port
 rust_new_memory_region
 rust_delete_memory_region