Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Merged by Bors] - Don't allocate for ComponentDescriptors of non-dynamic component types #4725

Closed
wants to merge 4 commits into from
Closed

[Merged by Bors] - Don't allocate for ComponentDescriptors of non-dynamic component types #4725

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
271aaff
Don't allocate for non-dynamic component types
james7132 May 11, 2022
ae9a7fa
Fix compilation error
james7132 May 12, 2022
eaf986c
Merge branch 'main' into cow-component-name
james7132 May 30, 2022
fb1cc34
Fix build
james7132 May 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions crates/bevy_ecs/src/component.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ use bevy_ptr::OwningPtr;
use std::{
alloc::Layout,
any::{Any, TypeId},
borrow::Cow,
mem::needs_drop,
};

Expand Down Expand Up @@ -164,7 +165,7 @@ impl SparseSetIndex for ComponentId {
}

pub struct ComponentDescriptor {
name: String,
name: Cow<'static, str>,
// SAFETY: This must remain private. It must match the statically known StorageType of the
// associated rust component type if one exists.
storage_type: StorageType,
Expand Down Expand Up @@ -201,7 +202,7 @@ impl ComponentDescriptor {
/// Create a new `ComponentDescriptor` for the type `T`.
pub fn new<T: Component>() -> Self {
Self {
name: std::any::type_name::<T>().to_string(),
name: Cow::Borrowed(std::any::type_name::<T>()),
storage_type: T::Storage::STORAGE_TYPE,
is_send_and_sync: true,
type_id: Some(TypeId::of::<T>()),
Expand All @@ -216,13 +217,13 @@ impl ComponentDescriptor {
/// - the `drop` fn must be usable on a pointer with a value of the layout `layout`
/// - the component type must be safe to access from any thread (Send + Sync in rust terms)
pub unsafe fn new_with_layout(
name: String,
name: impl Into<Cow<'static, str>>,
storage_type: StorageType,
layout: Layout,
drop: Option<for<'a> unsafe fn(OwningPtr<'a>)>,
) -> Self {
Self {
name,
name: name.into(),
storage_type,
is_send_and_sync: true,
type_id: None,
Expand All @@ -236,7 +237,7 @@ impl ComponentDescriptor {
/// The [`StorageType`] for resources is always [`TableStorage`].
pub fn new_resource<T: Resource>() -> Self {
Self {
name: std::any::type_name::<T>().to_string(),
name: Cow::Borrowed(std::any::type_name::<T>()),
// PERF: `SparseStorage` may actually be a more
// reasonable choice as `storage_type` for resources.
storage_type: StorageType::Table,
Expand All @@ -249,7 +250,7 @@ impl ComponentDescriptor {

fn new_non_send<T: Any>(storage_type: StorageType) -> Self {
Self {
name: std::any::type_name::<T>().to_string(),
name: Cow::Borrowed(std::any::type_name::<T>()),
storage_type,
is_send_and_sync: false,
type_id: Some(TypeId::of::<T>()),
Expand All @@ -270,7 +271,7 @@ impl ComponentDescriptor {

#[inline]
pub fn name(&self) -> &str {
&self.name
self.name.as_ref()
}
}

Expand Down