---

yaml
---
r: 140998
b: refs/heads/try2
c: 56c0b18
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: c42b03de17b2d0c567dc85417ec22518d69fd8ae
+refs/heads/try2: 56c0b188b66f71f55e2d577ca4a23830a31433e6
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libcore/rt/local_sched.rs

@@ -105,7 +105,7 @@ fn tls_key() -> tls::Key {
 
 fn maybe_tls_key() -> Option<tls::Key> {
     unsafe {
-        let key: *mut c_void = rust_get_sched_tls_key();
+        let key: *mut c_void = rust_get_rt_tls_key();
         let key: &mut tls::Key = cast::transmute(key);
         let key = *key;
         // Check that the key has been initialized.
@@ -130,7 +130,7 @@ fn maybe_tls_key() -> Option<tls::Key> {
 
 extern {
     #[fast_ffi]
-    fn rust_get_sched_tls_key() -> *mut c_void;
+    fn rust_get_rt_tls_key() -> *mut c_void;
 }
 
 #[test]

branches/try2/src/rt/rust_builtin.cpp

@@ -830,14 +830,14 @@ rust_get_rt_env() {
 }
 
 #ifndef _WIN32
-pthread_key_t sched_key = -1;
+pthread_key_t rt_key = -1;
 #else
-DWORD sched_key = -1;
+DWORD rt_key = -1;
 #endif
 
 extern "C" void*
-rust_get_sched_tls_key() {
-    return &sched_key;
+rust_get_rt_tls_key() {
+    return &rt_key;
 }
 
 // Initialize the global state required by the new scheduler
@@ -852,10 +852,10 @@ rust_initialize_global_state() {
     if (!initialized) {
 
 #ifndef _WIN32
-        assert(!pthread_key_create(&sched_key, NULL));
+        assert(!pthread_key_create(&rt_key, NULL));
 #else
-        sched_key = TlsAlloc();
-        assert(sched_key != TLS_OUT_OF_INDEXES);
+        rt_key = TlsAlloc();
+        assert(rt_key != TLS_OUT_OF_INDEXES);
 #endif
 
         initialized = true;

branches/try2/src/rt/rustrt.def.in

@@ -196,7 +196,7 @@ rust_get_global_data_ptr
 rust_inc_kernel_live_count
 rust_dec_kernel_live_count
 rust_exchange_count
-rust_get_sched_tls_key
+rust_get_rt_tls_key
 swap_registers
 rust_readdir
 rust_opendir