alternative to #5922, implements #5956 builds on top of https://github.com/bevyengine/bevy/pull/6402 # Objective https://github.com/bevyengine/bevy/issues/5956 goes into more detail, but the TLDR is: - bevy systems ensure disjoint accesses to resources and components, and for that to work there are methods `World::get_resource_unchecked_mut(&self)`, ..., `EntityRef::get_mut_unchecked(&self)` etc. - we don't have these unchecked methods for `by_id` variants, so third-party crate authors cannot build their own safe disjoint-access abstractions with these - having `_unchecked_mut` methods is not great, because in their presence safe code can accidentally violate subtle invariants. Having to go through `world.as_unsafe_world_cell().unsafe_method()` forces you to stop and think about what you want to write in your `// SAFETY` comment. The alternative is to keep exposing `_unchecked_mut` variants for every operation that we want third-party crates to build upon, but we'd prefer to avoid using these methods alltogether: https://github.com/bevyengine/bevy/pull/5922#issuecomment-1241954543 Also, this is something that **cannot be implemented outside of bevy**, so having either this PR or #5922 as an escape hatch with lots of discouraging comments would be great. ## Solution - add `UnsafeWorldCell` with `unsafe fn get_resource(&self)`, `unsafe fn get_resource_mut(&self)` - add `fn World::as_unsafe_world_cell(&mut self) -> UnsafeWorldCell<'_>` (and `as_unsafe_world_cell_readonly(&self)`) - add `UnsafeWorldCellEntityRef` with `unsafe fn get`, `unsafe fn get_mut` and the other utilities on `EntityRef` (no methods for spawning, despawning, insertion) - use the `UnsafeWorldCell` abstraction in `ReflectComponent`, `ReflectResource` and `ReflectAsset`, so these APIs are easier to reason about - remove `World::get_resource_mut_unchecked`, `EntityRef::get_mut_unchecked` and use `unsafe { world.as_unsafe_world_cell().get_mut() }` and `unsafe { world.as_unsafe_world_cell().get_entity(entity)?.get_mut() }` instead This PR does **not** make use of `UnsafeWorldCell` for anywhere else in `bevy_ecs` such as `SystemParam` or `Query`. That is a much larger change, and I am convinced that having `UnsafeWorldCell` is already useful for third-party crates. Implemented API: ```rust struct World { .. } impl World { fn as_unsafe_world_cell(&self) -> UnsafeWorldCell<'_>; } struct UnsafeWorldCell<'w>(&'w World); impl<'w> UnsafeWorldCell { unsafe fn world(&self) -> &World; fn get_entity(&self) -> UnsafeWorldCellEntityRef<'w>; // returns 'w which is `'self` of the `World::as_unsafe_world_cell(&'w self)` unsafe fn get_resource<T>(&self) -> Option<&'w T>; unsafe fn get_resource_by_id(&self, ComponentId) -> Option<&'w T>; unsafe fn get_resource_mut<T>(&self) -> Option<Mut<'w, T>>; unsafe fn get_resource_mut_by_id(&self) -> Option<MutUntyped<'w>>; unsafe fn get_non_send_resource<T>(&self) -> Option<&'w T>; unsafe fn get_non_send_resource_mut<T>(&self) -> Option<Mut<'w, T>>>; // not included: remove, remove_resource, despawn, anything that might change archetypes } struct UnsafeWorldCellEntityRef<'w> { .. } impl UnsafeWorldCellEntityRef<'w> { unsafe fn get<T>(&self, Entity) -> Option<&'w T>; unsafe fn get_by_id(&self, Entity, ComponentId) -> Option<Ptr<'w>>; unsafe fn get_mut<T>(&self, Entity) -> Option<Mut<'w, T>>; unsafe fn get_mut_by_id(&self, Entity, ComponentId) -> Option<MutUntyped<'w>>; unsafe fn get_change_ticks<T>(&self, Entity) -> Option<Mut<'w, T>>; // fn id, archetype, contains, contains_id, containts_type_id } ``` <details> <summary>UnsafeWorldCell docs</summary> Variant of the [`World`] where resource and component accesses takes a `&World`, and the responsibility to avoid aliasing violations are given to the caller instead of being checked at compile-time by rust's unique XOR shared rule. ### Rationale In rust, having a `&mut World` means that there are absolutely no other references to the safe world alive at the same time, without exceptions. Not even unsafe code can change this. But there are situations where careful shared mutable access through a type is possible and safe. For this, rust provides the [`UnsafeCell`](std::cell::UnsafeCell) escape hatch, which allows you to get a `*mut T` from a `&UnsafeCell<T>` and around which safe abstractions can be built. Access to resources and components can be done uniquely using [`World::resource_mut`] and [`World::entity_mut`], and shared using [`World::resource`] and [`World::entity`]. These methods use lifetimes to check at compile time that no aliasing rules are being broken. This alone is not enough to implement bevy systems where multiple systems can access *disjoint* parts of the world concurrently. For this, bevy stores all values of resources and components (and [`ComponentTicks`](crate::component::ComponentTicks)) in [`UnsafeCell`](std::cell::UnsafeCell)s, and carefully validates disjoint access patterns using APIs like [`System::component_access`](crate::system::System::component_access). A system then can be executed using [`System::run_unsafe`](crate::system::System::run_unsafe) with a `&World` and use methods with interior mutability to access resource values. access resource values. ### Example Usage [`UnsafeWorldCell`] can be used as a building block for writing APIs that safely allow disjoint access into the world. In the following example, the world is split into a resource access half and a component access half, where each one can safely hand out mutable references. ```rust use bevy_ecs::world::World; use bevy_ecs::change_detection::Mut; use bevy_ecs::system::Resource; use bevy_ecs::world::unsafe_world_cell_world::UnsafeWorldCell; // INVARIANT: existance of this struct means that users of it are the only ones being able to access resources in the world struct OnlyResourceAccessWorld<'w>(UnsafeWorldCell<'w>); // INVARIANT: existance of this struct means that users of it are the only ones being able to access components in the world struct OnlyComponentAccessWorld<'w>(UnsafeWorldCell<'w>); impl<'w> OnlyResourceAccessWorld<'w> { fn get_resource_mut<T: Resource>(&mut self) -> Option<Mut<'w, T>> { // SAFETY: resource access is allowed through this UnsafeWorldCell unsafe { self.0.get_resource_mut::<T>() } } } // impl<'w> OnlyComponentAccessWorld<'w> { // ... // } // the two interior mutable worlds borrow from the `&mut World`, so it cannot be accessed while they are live fn split_world_access(world: &mut World) -> (OnlyResourceAccessWorld<'_>, OnlyComponentAccessWorld<'_>) { let resource_access = OnlyResourceAccessWorld(unsafe { world.as_unsafe_world_cell() }); let component_access = OnlyComponentAccessWorld(unsafe { world.as_unsafe_world_cell() }); (resource_access, component_access) } ``` </details>
317 lines
12 KiB
Rust
317 lines
12 KiB
Rust
use std::any::{Any, TypeId};
|
|
|
|
use bevy_ecs::world::{unsafe_world_cell::UnsafeWorldCell, World};
|
|
use bevy_reflect::{FromReflect, FromType, Reflect, Uuid};
|
|
|
|
use crate::{Asset, Assets, Handle, HandleId, HandleUntyped};
|
|
|
|
/// Type data for the [`TypeRegistry`](bevy_reflect::TypeRegistry) used to operate on reflected [`Asset`]s.
|
|
///
|
|
/// This type provides similar methods to [`Assets<T>`] like `get`, `add` and `remove`, but can be used in situations where you don't know which asset type `T` you want
|
|
/// until runtime.
|
|
///
|
|
/// [`ReflectAsset`] can be obtained via [`TypeRegistration::data`](bevy_reflect::TypeRegistration::data) if the asset was registered using [`register_asset_reflect`](crate::AddAsset::register_asset_reflect).
|
|
#[derive(Clone)]
|
|
pub struct ReflectAsset {
|
|
type_uuid: Uuid,
|
|
handle_type_id: TypeId,
|
|
assets_resource_type_id: TypeId,
|
|
|
|
get: fn(&World, HandleUntyped) -> Option<&dyn Reflect>,
|
|
// SAFETY:
|
|
// - may only be called with a [`IteriorMutableWorld`] which can be used to access the corresponding `Assets<T>` resource mutably
|
|
// - may only be used to access **at most one** access at once
|
|
get_unchecked_mut: unsafe fn(UnsafeWorldCell<'_>, HandleUntyped) -> Option<&mut dyn Reflect>,
|
|
add: fn(&mut World, &dyn Reflect) -> HandleUntyped,
|
|
set: fn(&mut World, HandleUntyped, &dyn Reflect) -> HandleUntyped,
|
|
len: fn(&World) -> usize,
|
|
ids: for<'w> fn(&'w World) -> Box<dyn Iterator<Item = HandleId> + 'w>,
|
|
remove: fn(&mut World, HandleUntyped) -> Option<Box<dyn Reflect>>,
|
|
}
|
|
|
|
impl ReflectAsset {
|
|
/// The [`bevy_reflect::TypeUuid`] of the asset
|
|
pub fn type_uuid(&self) -> Uuid {
|
|
self.type_uuid
|
|
}
|
|
|
|
/// The [`TypeId`] of the [`Handle<T>`] for this asset
|
|
pub fn handle_type_id(&self) -> TypeId {
|
|
self.handle_type_id
|
|
}
|
|
|
|
/// The [`TypeId`] of the [`Assets<T>`] resource
|
|
pub fn assets_resource_type_id(&self) -> TypeId {
|
|
self.assets_resource_type_id
|
|
}
|
|
|
|
/// Equivalent of [`Assets::get`]
|
|
pub fn get<'w>(&self, world: &'w World, handle: HandleUntyped) -> Option<&'w dyn Reflect> {
|
|
(self.get)(world, handle)
|
|
}
|
|
|
|
/// Equivalent of [`Assets::get_mut`]
|
|
pub fn get_mut<'w>(
|
|
&self,
|
|
world: &'w mut World,
|
|
handle: HandleUntyped,
|
|
) -> Option<&'w mut dyn Reflect> {
|
|
// SAFETY: unique world access
|
|
unsafe { (self.get_unchecked_mut)(world.as_unsafe_world_cell(), handle) }
|
|
}
|
|
|
|
/// Equivalent of [`Assets::get_mut`], but works with an [`UnsafeWorldCell`].
|
|
///
|
|
/// Only use this method when you have ensured that you are the *only* one with access to the [`Assets`] resource of the asset type.
|
|
/// Furthermore, this does *not* allow you to have look up two distinct handles,
|
|
/// you can only have at most one alive at the same time.
|
|
/// This means that this is *not allowed*:
|
|
/// ```rust,no_run
|
|
/// # use bevy_asset::{ReflectAsset, HandleUntyped};
|
|
/// # use bevy_ecs::prelude::World;
|
|
/// # let reflect_asset: ReflectAsset = unimplemented!();
|
|
/// # let mut world: World = unimplemented!();
|
|
/// # let handle_1: HandleUntyped = unimplemented!();
|
|
/// # let handle_2: HandleUntyped = unimplemented!();
|
|
/// let unsafe_world_cell = world.as_unsafe_world_cell();
|
|
/// let a = unsafe { reflect_asset.get_unchecked_mut(unsafe_world_cell, handle_1).unwrap() };
|
|
/// let b = unsafe { reflect_asset.get_unchecked_mut(unsafe_world_cell, handle_2).unwrap() };
|
|
/// // ^ not allowed, two mutable references through the same asset resource, even though the
|
|
/// // handles are distinct
|
|
///
|
|
/// println!("a = {a:?}, b = {b:?}");
|
|
/// ```
|
|
///
|
|
/// # Safety
|
|
/// This method does not prevent you from having two mutable pointers to the same data,
|
|
/// violating Rust's aliasing rules. To avoid this:
|
|
/// * Only call this method if you know that the [`UnsafeWorldCell`] may be used to access the corresponding `Assets<T>`
|
|
/// * Don't call this method more than once in the same scope.
|
|
pub unsafe fn get_unchecked_mut<'w>(
|
|
&self,
|
|
world: UnsafeWorldCell<'w>,
|
|
handle: HandleUntyped,
|
|
) -> Option<&'w mut dyn Reflect> {
|
|
// SAFETY: requirements are deferred to the caller
|
|
(self.get_unchecked_mut)(world, handle)
|
|
}
|
|
|
|
/// Equivalent of [`Assets::add`]
|
|
pub fn add(&self, world: &mut World, value: &dyn Reflect) -> HandleUntyped {
|
|
(self.add)(world, value)
|
|
}
|
|
/// Equivalent of [`Assets::set`]
|
|
pub fn set(
|
|
&self,
|
|
world: &mut World,
|
|
handle: HandleUntyped,
|
|
value: &dyn Reflect,
|
|
) -> HandleUntyped {
|
|
(self.set)(world, handle, value)
|
|
}
|
|
|
|
/// Equivalent of [`Assets::remove`]
|
|
pub fn remove(&self, world: &mut World, handle: HandleUntyped) -> Option<Box<dyn Reflect>> {
|
|
(self.remove)(world, handle)
|
|
}
|
|
|
|
/// Equivalent of [`Assets::len`]
|
|
#[allow(clippy::len_without_is_empty)] // clippy expects the `is_empty` method to have the signature `(&self) -> bool`
|
|
pub fn len(&self, world: &World) -> usize {
|
|
(self.len)(world)
|
|
}
|
|
|
|
/// Equivalent of [`Assets::is_empty`]
|
|
pub fn is_empty(&self, world: &World) -> bool {
|
|
self.len(world) == 0
|
|
}
|
|
|
|
/// Equivalent of [`Assets::ids`]
|
|
pub fn ids<'w>(&self, world: &'w World) -> impl Iterator<Item = HandleId> + 'w {
|
|
(self.ids)(world)
|
|
}
|
|
}
|
|
|
|
impl<A: Asset + FromReflect> FromType<A> for ReflectAsset {
|
|
fn from_type() -> Self {
|
|
ReflectAsset {
|
|
type_uuid: A::TYPE_UUID,
|
|
handle_type_id: TypeId::of::<Handle<A>>(),
|
|
assets_resource_type_id: TypeId::of::<Assets<A>>(),
|
|
get: |world, handle| {
|
|
let assets = world.resource::<Assets<A>>();
|
|
let asset = assets.get(&handle.typed());
|
|
asset.map(|asset| asset as &dyn Reflect)
|
|
},
|
|
get_unchecked_mut: |world, handle| {
|
|
// SAFETY: `get_unchecked_mut` must be callied with `UnsafeWorldCell` having access to `Assets<A>`,
|
|
// and must ensure to only have at most one reference to it live at all times.
|
|
let assets = unsafe { world.get_resource_mut::<Assets<A>>().unwrap().into_inner() };
|
|
let asset = assets.get_mut(&handle.typed());
|
|
asset.map(|asset| asset as &mut dyn Reflect)
|
|
},
|
|
add: |world, value| {
|
|
let mut assets = world.resource_mut::<Assets<A>>();
|
|
let value: A = FromReflect::from_reflect(value)
|
|
.expect("could not call `FromReflect::from_reflect` in `ReflectAsset::add`");
|
|
assets.add(value).into()
|
|
},
|
|
set: |world, handle, value| {
|
|
let mut assets = world.resource_mut::<Assets<A>>();
|
|
let value: A = FromReflect::from_reflect(value)
|
|
.expect("could not call `FromReflect::from_reflect` in `ReflectAsset::set`");
|
|
assets.set(handle, value).into()
|
|
},
|
|
len: |world| {
|
|
let assets = world.resource::<Assets<A>>();
|
|
assets.len()
|
|
},
|
|
ids: |world| {
|
|
let assets = world.resource::<Assets<A>>();
|
|
Box::new(assets.ids())
|
|
},
|
|
remove: |world, handle| {
|
|
let mut assets = world.resource_mut::<Assets<A>>();
|
|
let value = assets.remove(handle);
|
|
value.map(|value| Box::new(value) as Box<dyn Reflect>)
|
|
},
|
|
}
|
|
}
|
|
}
|
|
|
|
/// Reflect type data struct relating a [`Handle<T>`] back to the `T` asset type.
|
|
///
|
|
/// Say you want to look up the asset values of a list of handles when you have access to their `&dyn Reflect` form.
|
|
/// Assets can be looked up in the world using [`ReflectAsset`], but how do you determine which [`ReflectAsset`] to use when
|
|
/// only looking at the handle? [`ReflectHandle`] is stored in the type registry on each `Handle<T>` type, so you can use [`ReflectHandle::asset_type_id`] to look up
|
|
/// the [`ReflectAsset`] type data on the corresponding `T` asset type:
|
|
///
|
|
///
|
|
/// ```rust,no_run
|
|
/// # use bevy_reflect::{TypeRegistry, prelude::*};
|
|
/// # use bevy_ecs::prelude::*;
|
|
/// use bevy_asset::{ReflectHandle, ReflectAsset};
|
|
///
|
|
/// # let world: &World = unimplemented!();
|
|
/// # let type_registry: TypeRegistry = unimplemented!();
|
|
/// let handles: Vec<&dyn Reflect> = unimplemented!();
|
|
/// for handle in handles {
|
|
/// let reflect_handle = type_registry.get_type_data::<ReflectHandle>(handle.type_id()).unwrap();
|
|
/// let reflect_asset = type_registry.get_type_data::<ReflectAsset>(reflect_handle.asset_type_id()).unwrap();
|
|
///
|
|
/// let handle = reflect_handle.downcast_handle_untyped(handle.as_any()).unwrap();
|
|
/// let value = reflect_asset.get(world, handle).unwrap();
|
|
/// println!("{value:?}");
|
|
/// }
|
|
/// ```
|
|
#[derive(Clone)]
|
|
pub struct ReflectHandle {
|
|
type_uuid: Uuid,
|
|
asset_type_id: TypeId,
|
|
downcast_handle_untyped: fn(&dyn Any) -> Option<HandleUntyped>,
|
|
typed: fn(HandleUntyped) -> Box<dyn Reflect>,
|
|
}
|
|
impl ReflectHandle {
|
|
/// The [`bevy_reflect::TypeUuid`] of the asset
|
|
pub fn type_uuid(&self) -> Uuid {
|
|
self.type_uuid
|
|
}
|
|
/// The [`TypeId`] of the asset
|
|
pub fn asset_type_id(&self) -> TypeId {
|
|
self.asset_type_id
|
|
}
|
|
|
|
/// A way to go from a [`Handle<T>`] in a `dyn Any` to a [`HandleUntyped`]
|
|
pub fn downcast_handle_untyped(&self, handle: &dyn Any) -> Option<HandleUntyped> {
|
|
(self.downcast_handle_untyped)(handle)
|
|
}
|
|
|
|
/// A way to go from a [`HandleUntyped`] to a [`Handle<T>`] in a `Box<dyn Reflect>`.
|
|
/// Equivalent of [`HandleUntyped::typed`].
|
|
pub fn typed(&self, handle: HandleUntyped) -> Box<dyn Reflect> {
|
|
(self.typed)(handle)
|
|
}
|
|
}
|
|
|
|
impl<A: Asset> FromType<Handle<A>> for ReflectHandle {
|
|
fn from_type() -> Self {
|
|
ReflectHandle {
|
|
type_uuid: A::TYPE_UUID,
|
|
asset_type_id: TypeId::of::<A>(),
|
|
downcast_handle_untyped: |handle: &dyn Any| {
|
|
handle
|
|
.downcast_ref::<Handle<A>>()
|
|
.map(|handle| handle.clone_untyped())
|
|
},
|
|
typed: |handle: HandleUntyped| Box::new(handle.typed::<A>()),
|
|
}
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use std::any::TypeId;
|
|
|
|
use bevy_app::{App, AppTypeRegistry};
|
|
use bevy_reflect::{FromReflect, Reflect, ReflectMut, TypeUuid};
|
|
|
|
use crate::{AddAsset, AssetPlugin, HandleUntyped, ReflectAsset};
|
|
|
|
#[derive(Reflect, FromReflect, TypeUuid)]
|
|
#[uuid = "09191350-1238-4736-9a89-46f04bda6966"]
|
|
struct AssetType {
|
|
field: String,
|
|
}
|
|
|
|
#[test]
|
|
fn test_reflect_asset_operations() {
|
|
let mut app = App::new();
|
|
app.add_plugin(AssetPlugin::default())
|
|
.add_asset::<AssetType>()
|
|
.register_asset_reflect::<AssetType>();
|
|
|
|
let reflect_asset = {
|
|
let type_registry = app.world.resource::<AppTypeRegistry>();
|
|
let type_registry = type_registry.read();
|
|
|
|
type_registry
|
|
.get_type_data::<ReflectAsset>(TypeId::of::<AssetType>())
|
|
.unwrap()
|
|
.clone()
|
|
};
|
|
|
|
let value = AssetType {
|
|
field: "test".into(),
|
|
};
|
|
|
|
let handle = reflect_asset.add(&mut app.world, &value);
|
|
let strukt = match reflect_asset
|
|
.get_mut(&mut app.world, handle)
|
|
.unwrap()
|
|
.reflect_mut()
|
|
{
|
|
ReflectMut::Struct(s) => s,
|
|
_ => unreachable!(),
|
|
};
|
|
strukt
|
|
.field_mut("field")
|
|
.unwrap()
|
|
.apply(&String::from("edited"));
|
|
|
|
assert_eq!(reflect_asset.len(&app.world), 1);
|
|
let ids: Vec<_> = reflect_asset.ids(&app.world).collect();
|
|
assert_eq!(ids.len(), 1);
|
|
|
|
let fetched_handle = HandleUntyped::weak(ids[0]);
|
|
let asset = reflect_asset
|
|
.get(&app.world, fetched_handle.clone_weak())
|
|
.unwrap();
|
|
assert_eq!(asset.downcast_ref::<AssetType>().unwrap().field, "edited");
|
|
|
|
reflect_asset
|
|
.remove(&mut app.world, fetched_handle)
|
|
.unwrap();
|
|
assert_eq!(reflect_asset.len(&app.world), 0);
|
|
}
|
|
}
|