# Objective - Contributes to #15460 ## Solution - Added the following features: - `std` (default) - `async_executor` (default) - `edge_executor` - `critical-section` - `portable-atomic` - Gated `tracing` in `bevy_utils` to allow compilation on certain platforms - Switched from `tracing` to `log` for simple message logging within `bevy_ecs`. Note that `tracing` supports capturing from `log` so this should be an uncontroversial change. - Fixed imports and added feature gates as required - Made `bevy_tasks` optional within `bevy_ecs`. Turns out it's only needed for parallel operations which are already gated behind `multi_threaded` anyway. ## Testing - Added to `compile-check-no-std` CI command - `cargo check -p bevy_ecs --no-default-features --features edge_executor,critical-section,portable-atomic --target thumbv6m-none-eabi` - `cargo check -p bevy_ecs --no-default-features --features edge_executor,critical-section` - `cargo check -p bevy_ecs --no-default-features` ## Draft Release Notes Bevy's core ECS now supports `no_std` platforms. In prior versions of Bevy, it was not possible to work with embedded or niche platforms due to our reliance on the standard library, `std`. This has blocked a number of novel use-cases for Bevy, such as an embedded database for IoT devices, or for creating games on retro consoles. With this release, `bevy_ecs` no longer requires `std`. To use Bevy on a `no_std` platform, you must disable default features and enable the new `edge_executor` and `critical-section` features. You may also need to enable `portable-atomic` and `critical-section` if your platform does not natively support all atomic types and operations used by Bevy. ```toml [dependencies] bevy_ecs = { version = "0.16", default-features = false, features = [ # Required for platforms with incomplete atomics (e.g., Raspberry Pi Pico) "portable-atomic", "critical-section", # Optional "bevy_reflect", "serialize", "bevy_debug_stepping", "edge_executor" ] } ``` Currently, this has been tested on bare-metal x86 and the Raspberry Pi Pico. If you have trouble using `bevy_ecs` on a particular platform, please reach out either through a GitHub issue or in the `no_std` working group on the Bevy Discord server. Keep an eye out for future `no_std` updates as we continue to improve the parity between `std` and `no_std`. We look forward to seeing what kinds of applications are now possible with Bevy! ## Notes - Creating PR in draft to ensure CI is passing before requesting reviews. - This implementation has no support for multithreading in `no_std`, especially due to `NonSend` being unsound if allowed in multithreading. The reason is we cannot check the `ThreadId` in `no_std`, so we have no mechanism to at-runtime determine if access is sound. --------- Co-authored-by: Alice Cecile <alice.i.cecile@gmail.com> Co-authored-by: Vic <59878206+Victoronz@users.noreply.github.com>
151 lines
4.2 KiB
Rust
151 lines
4.2 KiB
Rust
use crate::{
|
|
component::Tick,
|
|
storage::SparseSetIndex,
|
|
system::{ExclusiveSystemParam, ReadOnlySystemParam, SystemMeta, SystemParam},
|
|
world::{FromWorld, World},
|
|
};
|
|
|
|
#[cfg(not(feature = "portable-atomic"))]
|
|
use core::sync::atomic::{AtomicUsize, Ordering};
|
|
|
|
#[cfg(feature = "portable-atomic")]
|
|
use portable_atomic::{AtomicUsize, Ordering};
|
|
|
|
use super::unsafe_world_cell::UnsafeWorldCell;
|
|
|
|
#[derive(Copy, Clone, PartialEq, Eq, Debug, Hash)]
|
|
// We use usize here because that is the largest `Atomic` we want to require
|
|
/// A unique identifier for a [`World`].
|
|
///
|
|
/// The trait [`FromWorld`] is implemented for this type, which returns the
|
|
/// ID of the world passed to [`FromWorld::from_world`].
|
|
// Note that this *is* used by external crates as well as for internal safety checks
|
|
pub struct WorldId(usize);
|
|
|
|
/// The next [`WorldId`].
|
|
static MAX_WORLD_ID: AtomicUsize = AtomicUsize::new(0);
|
|
|
|
impl WorldId {
|
|
/// Create a new, unique [`WorldId`]. Returns [`None`] if the supply of unique
|
|
/// [`WorldId`]s has been exhausted
|
|
///
|
|
/// Please note that the [`WorldId`]s created from this method are unique across
|
|
/// time - if a given [`WorldId`] is [`Drop`]ped its value still cannot be reused
|
|
pub fn new() -> Option<Self> {
|
|
MAX_WORLD_ID
|
|
// We use `Relaxed` here since this atomic only needs to be consistent with itself
|
|
.fetch_update(Ordering::Relaxed, Ordering::Relaxed, |val| {
|
|
val.checked_add(1)
|
|
})
|
|
.map(WorldId)
|
|
.ok()
|
|
}
|
|
}
|
|
|
|
impl FromWorld for WorldId {
|
|
#[inline]
|
|
fn from_world(world: &mut World) -> Self {
|
|
world.id()
|
|
}
|
|
}
|
|
|
|
// SAFETY: No world data is accessed.
|
|
unsafe impl ReadOnlySystemParam for WorldId {}
|
|
|
|
// SAFETY: No world data is accessed.
|
|
unsafe impl SystemParam for WorldId {
|
|
type State = ();
|
|
|
|
type Item<'world, 'state> = WorldId;
|
|
|
|
fn init_state(_: &mut World, _: &mut SystemMeta) -> Self::State {}
|
|
|
|
#[inline]
|
|
unsafe fn get_param<'world, 'state>(
|
|
_: &'state mut Self::State,
|
|
_: &SystemMeta,
|
|
world: UnsafeWorldCell<'world>,
|
|
_: Tick,
|
|
) -> Self::Item<'world, 'state> {
|
|
world.id()
|
|
}
|
|
}
|
|
|
|
impl ExclusiveSystemParam for WorldId {
|
|
type State = WorldId;
|
|
type Item<'s> = WorldId;
|
|
|
|
fn init(world: &mut World, _system_meta: &mut SystemMeta) -> Self::State {
|
|
world.id()
|
|
}
|
|
|
|
fn get_param<'s>(state: &'s mut Self::State, _system_meta: &SystemMeta) -> Self::Item<'s> {
|
|
*state
|
|
}
|
|
}
|
|
|
|
impl SparseSetIndex for WorldId {
|
|
#[inline]
|
|
fn sparse_set_index(&self) -> usize {
|
|
self.0
|
|
}
|
|
|
|
#[inline]
|
|
fn get_sparse_set_index(value: usize) -> Self {
|
|
Self(value)
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn world_ids_unique() {
|
|
let ids = core::iter::repeat_with(WorldId::new)
|
|
.take(50)
|
|
.map(Option::unwrap)
|
|
.collect::<Vec<_>>();
|
|
for (i, &id1) in ids.iter().enumerate() {
|
|
// For the first element, i is 0 - so skip 1
|
|
for &id2 in ids.iter().skip(i + 1) {
|
|
assert_ne!(id1, id2, "WorldIds should not repeat");
|
|
}
|
|
}
|
|
}
|
|
|
|
#[test]
|
|
fn world_id_system_param() {
|
|
fn test_system(world_id: WorldId) -> WorldId {
|
|
world_id
|
|
}
|
|
|
|
let mut world = World::default();
|
|
let system_id = world.register_system(test_system);
|
|
let world_id = world.run_system(system_id).unwrap();
|
|
assert_eq!(world.id(), world_id);
|
|
}
|
|
|
|
#[test]
|
|
fn world_id_exclusive_system_param() {
|
|
fn test_system(_world: &mut World, world_id: WorldId) -> WorldId {
|
|
world_id
|
|
}
|
|
|
|
let mut world = World::default();
|
|
let system_id = world.register_system(test_system);
|
|
let world_id = world.run_system(system_id).unwrap();
|
|
assert_eq!(world.id(), world_id);
|
|
}
|
|
|
|
// We cannot use this test as-is, as it causes other tests to panic due to using the same atomic variable.
|
|
// #[test]
|
|
// #[should_panic]
|
|
// fn panic_on_overflow() {
|
|
// MAX_WORLD_ID.store(usize::MAX - 50, Ordering::Relaxed);
|
|
// core::iter::repeat_with(WorldId::new)
|
|
// .take(500)
|
|
// .for_each(|_| ());
|
|
// }
|
|
}
|