-
Notifications
You must be signed in to change notification settings - Fork 13.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Refactor
thread_info
to remove the RefCell
`thread_info` currently uses `RefCell`-based initialization. Refactor this to use `OnceCell` instead which is more performant and better suits the needs of one-time initialization.
- Loading branch information
Showing
1 changed file
with
18 additions
and
16 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,46 +1,48 @@ | ||
#![allow(dead_code)] // stack_guard isn't used right now on all platforms | ||
|
||
use crate::cell::RefCell; | ||
use crate::cell::OnceCell; | ||
use crate::sys::thread::guard::Guard; | ||
use crate::thread::Thread; | ||
|
||
// 32, 0x8 | ||
struct ThreadInfo { | ||
stack_guard: Option<Guard>, | ||
thread: Thread, | ||
stack_guard: OnceCell<Guard>, | ||
thread: OnceCell<Thread>, | ||
} | ||
|
||
thread_local! { static THREAD_INFO: RefCell<Option<ThreadInfo>> = const { RefCell::new(None) } } | ||
thread_local! { | ||
static THREAD_INFO: ThreadInfo = const { ThreadInfo { | ||
stack_guard: OnceCell::new(), | ||
thread: OnceCell::new() | ||
} }; | ||
} | ||
|
||
impl ThreadInfo { | ||
fn with<R, F>(f: F) -> Option<R> | ||
where | ||
F: FnOnce(&mut ThreadInfo) -> R, | ||
F: FnOnce(&Thread, &OnceCell<Guard>) -> R, | ||
{ | ||
THREAD_INFO | ||
.try_with(move |thread_info| { | ||
let mut thread_info = thread_info.borrow_mut(); | ||
let thread_info = thread_info.get_or_insert_with(|| ThreadInfo { | ||
stack_guard: None, | ||
thread: Thread::new(None), | ||
}); | ||
f(thread_info) | ||
let thread = thread_info.thread.get_or_init(|| Thread::new(None)); | ||
f(thread, &thread_info.stack_guard) | ||
}) | ||
.ok() | ||
} | ||
} | ||
|
||
pub fn current_thread() -> Option<Thread> { | ||
ThreadInfo::with(|info| info.thread.clone()) | ||
ThreadInfo::with(|thread, _| thread.clone()) | ||
} | ||
|
||
pub fn stack_guard() -> Option<Guard> { | ||
ThreadInfo::with(|info| info.stack_guard.clone()).and_then(|o| o) | ||
ThreadInfo::with(|_, guard| guard.get().cloned()).flatten() | ||
} | ||
|
||
pub fn set(stack_guard: Option<Guard>, thread: Thread) { | ||
THREAD_INFO.with(move |thread_info| { | ||
let mut thread_info = thread_info.borrow_mut(); | ||
rtassert!(thread_info.is_none()); | ||
*thread_info = Some(ThreadInfo { stack_guard, thread }); | ||
rtassert!(thread_info.stack_guard.get().is_none() && thread_info.thread.get().is_none()); | ||
stack_guard.map(|g| thread_info.stack_guard.set(g).unwrap()); | ||
thread_info.thread.set(thread).unwrap(); | ||
}); | ||
} |