
# Objective - Fixes #6370 - Closes #6581 ## Solution - Added the following lints to the workspace: - `std_instead_of_core` - `std_instead_of_alloc` - `alloc_instead_of_core` - Used `cargo +nightly fmt` with [item level use formatting](https://rust-lang.github.io/rustfmt/?version=v1.6.0&search=#Item%5C%3A) to split all `use` statements into single items. - Used `cargo clippy --workspace --all-targets --all-features --fix --allow-dirty` to _attempt_ to resolve the new linting issues, and intervened where the lint was unable to resolve the issue automatically (usually due to needing an `extern crate alloc;` statement in a crate root). - Manually removed certain uses of `std` where negative feature gating prevented `--all-features` from finding the offending uses. - Used `cargo +nightly fmt` with [crate level use formatting](https://rust-lang.github.io/rustfmt/?version=v1.6.0&search=#Crate%5C%3A) to re-merge all `use` statements matching Bevy's previous styling. - Manually fixed cases where the `fmt` tool could not re-merge `use` statements due to conditional compilation attributes. ## Testing - Ran CI locally ## Migration Guide The MSRV is now 1.81. Please update to this version or higher. ## Notes - This is a _massive_ change to try and push through, which is why I've outlined the semi-automatic steps I used to create this PR, in case this fails and someone else tries again in the future. - Making this change has no impact on user code, but does mean Bevy contributors will be warned to use `core` and `alloc` instead of `std` where possible. - This lint is a critical first step towards investigating `no_std` options for Bevy. --------- Co-authored-by: François Mockers <francois.mockers@vleue.com>
132 lines
3.8 KiB
Rust
132 lines
3.8 KiB
Rust
use core::marker::PhantomData;
|
|
use std::thread::{self, ThreadId};
|
|
|
|
use async_executor::{Executor, Task};
|
|
use futures_lite::Future;
|
|
|
|
/// An executor that can only be ticked on the thread it was instantiated on. But
|
|
/// can spawn `Send` tasks from other threads.
|
|
///
|
|
/// # Example
|
|
/// ```
|
|
/// # use std::sync::{Arc, atomic::{AtomicI32, Ordering}};
|
|
/// use bevy_tasks::ThreadExecutor;
|
|
///
|
|
/// let thread_executor = ThreadExecutor::new();
|
|
/// let count = Arc::new(AtomicI32::new(0));
|
|
///
|
|
/// // create some owned values that can be moved into another thread
|
|
/// let count_clone = count.clone();
|
|
///
|
|
/// std::thread::scope(|scope| {
|
|
/// scope.spawn(|| {
|
|
/// // we cannot get the ticker from another thread
|
|
/// let not_thread_ticker = thread_executor.ticker();
|
|
/// assert!(not_thread_ticker.is_none());
|
|
///
|
|
/// // but we can spawn tasks from another thread
|
|
/// thread_executor.spawn(async move {
|
|
/// count_clone.fetch_add(1, Ordering::Relaxed);
|
|
/// }).detach();
|
|
/// });
|
|
/// });
|
|
///
|
|
/// // the tasks do not make progress unless the executor is manually ticked
|
|
/// assert_eq!(count.load(Ordering::Relaxed), 0);
|
|
///
|
|
/// // tick the ticker until task finishes
|
|
/// let thread_ticker = thread_executor.ticker().unwrap();
|
|
/// thread_ticker.try_tick();
|
|
/// assert_eq!(count.load(Ordering::Relaxed), 1);
|
|
/// ```
|
|
#[derive(Debug)]
|
|
pub struct ThreadExecutor<'task> {
|
|
executor: Executor<'task>,
|
|
thread_id: ThreadId,
|
|
}
|
|
|
|
impl<'task> Default for ThreadExecutor<'task> {
|
|
fn default() -> Self {
|
|
Self {
|
|
executor: Executor::new(),
|
|
thread_id: thread::current().id(),
|
|
}
|
|
}
|
|
}
|
|
|
|
impl<'task> ThreadExecutor<'task> {
|
|
/// create a new [`ThreadExecutor`]
|
|
pub fn new() -> Self {
|
|
Self::default()
|
|
}
|
|
|
|
/// Spawn a task on the thread executor
|
|
pub fn spawn<T: Send + 'task>(
|
|
&self,
|
|
future: impl Future<Output = T> + Send + 'task,
|
|
) -> Task<T> {
|
|
self.executor.spawn(future)
|
|
}
|
|
|
|
/// Gets the [`ThreadExecutorTicker`] for this executor.
|
|
/// Use this to tick the executor.
|
|
/// It only returns the ticker if it's on the thread the executor was created on
|
|
/// and returns `None` otherwise.
|
|
pub fn ticker<'ticker>(&'ticker self) -> Option<ThreadExecutorTicker<'task, 'ticker>> {
|
|
if thread::current().id() == self.thread_id {
|
|
return Some(ThreadExecutorTicker {
|
|
executor: self,
|
|
_marker: PhantomData,
|
|
});
|
|
}
|
|
None
|
|
}
|
|
|
|
/// Returns true if `self` and `other`'s executor is same
|
|
pub fn is_same(&self, other: &Self) -> bool {
|
|
core::ptr::eq(self, other)
|
|
}
|
|
}
|
|
|
|
/// Used to tick the [`ThreadExecutor`]. The executor does not
|
|
/// make progress unless it is manually ticked on the thread it was
|
|
/// created on.
|
|
#[derive(Debug)]
|
|
pub struct ThreadExecutorTicker<'task, 'ticker> {
|
|
executor: &'ticker ThreadExecutor<'task>,
|
|
// make type not send or sync
|
|
_marker: PhantomData<*const ()>,
|
|
}
|
|
impl<'task, 'ticker> ThreadExecutorTicker<'task, 'ticker> {
|
|
/// Tick the thread executor.
|
|
pub async fn tick(&self) {
|
|
self.executor.executor.tick().await;
|
|
}
|
|
|
|
/// Synchronously try to tick a task on the executor.
|
|
/// Returns false if does not find a task to tick.
|
|
pub fn try_tick(&self) -> bool {
|
|
self.executor.executor.try_tick()
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
use alloc::sync::Arc;
|
|
|
|
#[test]
|
|
fn test_ticker() {
|
|
let executor = Arc::new(ThreadExecutor::new());
|
|
let ticker = executor.ticker();
|
|
assert!(ticker.is_some());
|
|
|
|
thread::scope(|s| {
|
|
s.spawn(|| {
|
|
let ticker = executor.ticker();
|
|
assert!(ticker.is_none());
|
|
});
|
|
});
|
|
}
|
|
}
|