diff options
| author | bors <bors@rust-lang.org> | 2013-05-20 21:40:27 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-05-20 21:40:27 -0700 |
| commit | 7abcc142e5da1b87c59a1510fa87aefc4122bd6d (patch) | |
| tree | e069fcc7e3da94e50e678fcc723eb59b87123b3c /src/rt | |
| parent | adaae45c3e15f95b052648f3511a1097155296b9 (diff) | |
| parent | a246e8faf362a1615b5bb4938455dd70642e0f4b (diff) | |
| download | rust-7abcc142e5da1b87c59a1510fa87aefc4122bd6d.tar.gz rust-7abcc142e5da1b87c59a1510fa87aefc4122bd6d.zip | |
auto merge of #6626 : brson/rust/io-upstream, r=graydon
r? Mostly refactoring, and adding some of the remaining types described in #4419. The [`Local`](https://github.com/brson/rust/blob/3b4ff41511cfaa5e311b03d16b47bf40c117fa2f/src/libcore/rt/local.rs#L17) trait collects some common, often unsafe patterns around task-local and thread-local values. Making all these types safe is largely the aim of #6210.
Diffstat (limited to 'src/rt')
| -rw-r--r-- | src/rt/rust_builtin.cpp | 4 | ||||
| -rw-r--r-- | src/rt/rustrt.def.in | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/rt/rust_builtin.cpp b/src/rt/rust_builtin.cpp index 1a64066b5a9..a2f253550af 100644 --- a/src/rt/rust_builtin.cpp +++ b/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; diff --git a/src/rt/rustrt.def.in b/src/rt/rustrt.def.in index cdc282440b8..e3e522aa7ce 100644 --- a/src/rt/rustrt.def.in +++ b/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 |