rt: Rename sched_key to rt_key
It is more general-purpose than holding scheduler pointers
This commit is contained in:
@@ -105,7 +105,7 @@ fn tls_key() -> tls::Key {
|
|||||||
|
|
||||||
fn maybe_tls_key() -> Option<tls::Key> {
|
fn maybe_tls_key() -> Option<tls::Key> {
|
||||||
unsafe {
|
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: &mut tls::Key = cast::transmute(key);
|
||||||
let key = *key;
|
let key = *key;
|
||||||
// Check that the key has been initialized.
|
// Check that the key has been initialized.
|
||||||
@@ -130,7 +130,7 @@ fn maybe_tls_key() -> Option<tls::Key> {
|
|||||||
|
|
||||||
extern {
|
extern {
|
||||||
#[fast_ffi]
|
#[fast_ffi]
|
||||||
fn rust_get_sched_tls_key() -> *mut c_void;
|
fn rust_get_rt_tls_key() -> *mut c_void;
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
|
|||||||
@@ -830,14 +830,14 @@ rust_get_rt_env() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#ifndef _WIN32
|
#ifndef _WIN32
|
||||||
pthread_key_t sched_key = -1;
|
pthread_key_t rt_key = -1;
|
||||||
#else
|
#else
|
||||||
DWORD sched_key = -1;
|
DWORD rt_key = -1;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
extern "C" void*
|
extern "C" void*
|
||||||
rust_get_sched_tls_key() {
|
rust_get_rt_tls_key() {
|
||||||
return &sched_key;
|
return &rt_key;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Initialize the global state required by the new scheduler
|
// Initialize the global state required by the new scheduler
|
||||||
@@ -852,10 +852,10 @@ rust_initialize_global_state() {
|
|||||||
if (!initialized) {
|
if (!initialized) {
|
||||||
|
|
||||||
#ifndef _WIN32
|
#ifndef _WIN32
|
||||||
assert(!pthread_key_create(&sched_key, NULL));
|
assert(!pthread_key_create(&rt_key, NULL));
|
||||||
#else
|
#else
|
||||||
sched_key = TlsAlloc();
|
rt_key = TlsAlloc();
|
||||||
assert(sched_key != TLS_OUT_OF_INDEXES);
|
assert(rt_key != TLS_OUT_OF_INDEXES);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
initialized = true;
|
initialized = true;
|
||||||
|
|||||||
@@ -196,7 +196,7 @@ rust_get_global_data_ptr
|
|||||||
rust_inc_kernel_live_count
|
rust_inc_kernel_live_count
|
||||||
rust_dec_kernel_live_count
|
rust_dec_kernel_live_count
|
||||||
rust_exchange_count
|
rust_exchange_count
|
||||||
rust_get_sched_tls_key
|
rust_get_rt_tls_key
|
||||||
swap_registers
|
swap_registers
|
||||||
rust_readdir
|
rust_readdir
|
||||||
rust_opendir
|
rust_opendir
|
||||||
|
|||||||
Reference in New Issue
Block a user