
# Objective - (Eventually) reduce noise in reporting access conflicts between unordered systems. - `SystemStage` only looks at unfiltered `ComponentId` access, any conflicts reported are potentially `false`. - the systems could still be accessing disjoint archetypes - Comparing systems' filtered access sets can maybe avoid that (for statically known component types). - #4204 ## Solution - Modify `SparseSetIndex` trait to require `PartialEq`, `Eq`, and `Hash` (all internal types except `BundleId` already did). - Add `is_compatible` and `get_conflicts` methods to `FilteredAccessSet<T>` - (existing method renamed to `get_conflicts_single`) - Add docs for those and all the other methods while I'm at it.
493 lines
15 KiB
Rust
493 lines
15 KiB
Rust
use crate::{
|
|
component::{ComponentId, ComponentInfo, ComponentTicks},
|
|
entity::Entity,
|
|
storage::BlobVec,
|
|
};
|
|
use bevy_ptr::{OwningPtr, Ptr};
|
|
use std::{cell::UnsafeCell, hash::Hash, marker::PhantomData};
|
|
|
|
#[derive(Debug)]
|
|
pub struct SparseArray<I, V = I> {
|
|
values: Vec<Option<V>>,
|
|
marker: PhantomData<I>,
|
|
}
|
|
|
|
impl<I: SparseSetIndex, V> Default for SparseArray<I, V> {
|
|
fn default() -> Self {
|
|
Self::new()
|
|
}
|
|
}
|
|
|
|
impl<I, V> SparseArray<I, V> {
|
|
#[inline]
|
|
pub const fn new() -> Self {
|
|
Self {
|
|
values: Vec::new(),
|
|
marker: PhantomData,
|
|
}
|
|
}
|
|
}
|
|
|
|
impl<I: SparseSetIndex, V> SparseArray<I, V> {
|
|
pub fn with_capacity(capacity: usize) -> Self {
|
|
Self {
|
|
values: Vec::with_capacity(capacity),
|
|
marker: PhantomData,
|
|
}
|
|
}
|
|
|
|
#[inline]
|
|
pub fn insert(&mut self, index: I, value: V) {
|
|
let index = index.sparse_set_index();
|
|
if index >= self.values.len() {
|
|
self.values.resize_with(index + 1, || None);
|
|
}
|
|
self.values[index] = Some(value);
|
|
}
|
|
|
|
#[inline]
|
|
pub fn contains(&self, index: I) -> bool {
|
|
let index = index.sparse_set_index();
|
|
self.values.get(index).map(|v| v.is_some()).unwrap_or(false)
|
|
}
|
|
|
|
#[inline]
|
|
pub fn get(&self, index: I) -> Option<&V> {
|
|
let index = index.sparse_set_index();
|
|
self.values.get(index).map(|v| v.as_ref()).unwrap_or(None)
|
|
}
|
|
|
|
#[inline]
|
|
pub fn get_mut(&mut self, index: I) -> Option<&mut V> {
|
|
let index = index.sparse_set_index();
|
|
self.values
|
|
.get_mut(index)
|
|
.map(|v| v.as_mut())
|
|
.unwrap_or(None)
|
|
}
|
|
|
|
#[inline]
|
|
pub fn remove(&mut self, index: I) -> Option<V> {
|
|
let index = index.sparse_set_index();
|
|
self.values.get_mut(index).and_then(|value| value.take())
|
|
}
|
|
|
|
#[inline]
|
|
pub fn get_or_insert_with(&mut self, index: I, func: impl FnOnce() -> V) -> &mut V {
|
|
let index = index.sparse_set_index();
|
|
if index < self.values.len() {
|
|
return self.values[index].get_or_insert_with(func);
|
|
}
|
|
self.values.resize_with(index + 1, || None);
|
|
let value = &mut self.values[index];
|
|
*value = Some(func());
|
|
value.as_mut().unwrap()
|
|
}
|
|
|
|
pub fn clear(&mut self) {
|
|
self.values.clear();
|
|
}
|
|
}
|
|
|
|
/// A sparse data structure of [Components](crate::component::Component)
|
|
///
|
|
/// Designed for relatively fast insertions and deletions.
|
|
#[derive(Debug)]
|
|
pub struct ComponentSparseSet {
|
|
dense: BlobVec,
|
|
ticks: Vec<UnsafeCell<ComponentTicks>>,
|
|
entities: Vec<Entity>,
|
|
sparse: SparseArray<Entity, usize>,
|
|
}
|
|
|
|
impl ComponentSparseSet {
|
|
pub fn new(component_info: &ComponentInfo, capacity: usize) -> Self {
|
|
Self {
|
|
// SAFE: component_info.drop() is compatible with the items that will be inserted.
|
|
dense: unsafe {
|
|
BlobVec::new(component_info.layout(), component_info.drop(), capacity)
|
|
},
|
|
ticks: Vec::with_capacity(capacity),
|
|
entities: Vec::with_capacity(capacity),
|
|
sparse: Default::default(),
|
|
}
|
|
}
|
|
|
|
pub fn clear(&mut self) {
|
|
self.dense.clear();
|
|
self.ticks.clear();
|
|
self.entities.clear();
|
|
self.sparse.clear();
|
|
}
|
|
|
|
#[inline]
|
|
pub fn len(&self) -> usize {
|
|
self.dense.len()
|
|
}
|
|
|
|
#[inline]
|
|
pub fn is_empty(&self) -> bool {
|
|
self.dense.len() == 0
|
|
}
|
|
|
|
/// Inserts the `entity` key and component `value` pair into this sparse
|
|
/// set.
|
|
///
|
|
/// # Safety
|
|
/// The `value` pointer must point to a valid address that matches the [`Layout`](std::alloc::Layout)
|
|
/// inside the [`ComponentInfo`] given when constructing this sparse set.
|
|
pub unsafe fn insert(&mut self, entity: Entity, value: OwningPtr<'_>, change_tick: u32) {
|
|
if let Some(&dense_index) = self.sparse.get(entity) {
|
|
self.dense.replace_unchecked(dense_index, value);
|
|
*self.ticks.get_unchecked_mut(dense_index) =
|
|
UnsafeCell::new(ComponentTicks::new(change_tick));
|
|
} else {
|
|
let dense_index = self.dense.len();
|
|
self.dense.push(value);
|
|
self.sparse.insert(entity, dense_index);
|
|
debug_assert_eq!(self.ticks.len(), dense_index);
|
|
debug_assert_eq!(self.entities.len(), dense_index);
|
|
self.ticks
|
|
.push(UnsafeCell::new(ComponentTicks::new(change_tick)));
|
|
self.entities.push(entity);
|
|
}
|
|
}
|
|
|
|
#[inline]
|
|
pub fn contains(&self, entity: Entity) -> bool {
|
|
self.sparse.contains(entity)
|
|
}
|
|
|
|
#[inline]
|
|
pub fn get(&self, entity: Entity) -> Option<Ptr<'_>> {
|
|
self.sparse.get(entity).map(|dense_index| {
|
|
// SAFE: if the sparse index points to something in the dense vec, it exists
|
|
unsafe { self.dense.get_unchecked(*dense_index) }
|
|
})
|
|
}
|
|
|
|
#[inline]
|
|
pub fn get_with_ticks(&self, entity: Entity) -> Option<(Ptr<'_>, &UnsafeCell<ComponentTicks>)> {
|
|
let dense_index = *self.sparse.get(entity)?;
|
|
// SAFE: if the sparse index points to something in the dense vec, it exists
|
|
unsafe {
|
|
Some((
|
|
self.dense.get_unchecked(dense_index),
|
|
self.ticks.get_unchecked(dense_index),
|
|
))
|
|
}
|
|
}
|
|
|
|
#[inline]
|
|
pub fn get_ticks(&self, entity: Entity) -> Option<&UnsafeCell<ComponentTicks>> {
|
|
let dense_index = *self.sparse.get(entity)?;
|
|
// SAFE: if the sparse index points to something in the dense vec, it exists
|
|
unsafe { Some(self.ticks.get_unchecked(dense_index)) }
|
|
}
|
|
|
|
/// Removes the `entity` from this sparse set and returns a pointer to the associated value (if
|
|
/// it exists).
|
|
#[must_use = "The returned pointer must be used to drop the removed component."]
|
|
pub fn remove_and_forget(&mut self, entity: Entity) -> Option<OwningPtr<'_>> {
|
|
self.sparse.remove(entity).map(|dense_index| {
|
|
self.ticks.swap_remove(dense_index);
|
|
self.entities.swap_remove(dense_index);
|
|
let is_last = dense_index == self.dense.len() - 1;
|
|
// SAFE: dense_index was just removed from `sparse`, which ensures that it is valid
|
|
let value = unsafe { self.dense.swap_remove_and_forget_unchecked(dense_index) };
|
|
if !is_last {
|
|
let swapped_entity = self.entities[dense_index];
|
|
*self.sparse.get_mut(swapped_entity).unwrap() = dense_index;
|
|
}
|
|
value
|
|
})
|
|
}
|
|
|
|
pub fn remove(&mut self, entity: Entity) -> bool {
|
|
if let Some(dense_index) = self.sparse.remove(entity) {
|
|
self.ticks.swap_remove(dense_index);
|
|
self.entities.swap_remove(dense_index);
|
|
let is_last = dense_index == self.dense.len() - 1;
|
|
// SAFE: if the sparse index points to something in the dense vec, it exists
|
|
unsafe { self.dense.swap_remove_and_drop_unchecked(dense_index) }
|
|
if !is_last {
|
|
let swapped_entity = self.entities[dense_index];
|
|
*self.sparse.get_mut(swapped_entity).unwrap() = dense_index;
|
|
}
|
|
true
|
|
} else {
|
|
false
|
|
}
|
|
}
|
|
|
|
pub(crate) fn check_change_ticks(&mut self, change_tick: u32) {
|
|
for component_ticks in &mut self.ticks {
|
|
component_ticks.get_mut().check_ticks(change_tick);
|
|
}
|
|
}
|
|
}
|
|
|
|
/// A data structure that blends dense and sparse storage
|
|
///
|
|
/// `I` is the type of the indices, while `V` is the type of data stored in the dense storage.
|
|
#[derive(Debug)]
|
|
pub struct SparseSet<I, V: 'static> {
|
|
dense: Vec<V>,
|
|
indices: Vec<I>,
|
|
sparse: SparseArray<I, usize>,
|
|
}
|
|
|
|
impl<I: SparseSetIndex, V> Default for SparseSet<I, V> {
|
|
fn default() -> Self {
|
|
Self::new()
|
|
}
|
|
}
|
|
impl<I, V> SparseSet<I, V> {
|
|
pub const fn new() -> Self {
|
|
Self {
|
|
dense: Vec::new(),
|
|
indices: Vec::new(),
|
|
sparse: SparseArray::new(),
|
|
}
|
|
}
|
|
}
|
|
|
|
impl<I: SparseSetIndex, V> SparseSet<I, V> {
|
|
pub fn with_capacity(capacity: usize) -> Self {
|
|
Self {
|
|
dense: Vec::with_capacity(capacity),
|
|
indices: Vec::with_capacity(capacity),
|
|
sparse: Default::default(),
|
|
}
|
|
}
|
|
|
|
#[inline]
|
|
pub fn capacity(&self) -> usize {
|
|
self.dense.capacity()
|
|
}
|
|
|
|
pub fn insert(&mut self, index: I, value: V) {
|
|
if let Some(dense_index) = self.sparse.get(index.clone()).cloned() {
|
|
// SAFE: dense indices stored in self.sparse always exist
|
|
unsafe {
|
|
*self.dense.get_unchecked_mut(dense_index) = value;
|
|
}
|
|
} else {
|
|
self.sparse.insert(index.clone(), self.dense.len());
|
|
self.indices.push(index);
|
|
self.dense.push(value);
|
|
}
|
|
|
|
// PERF: switch to this. it's faster but it has an invalid memory access on
|
|
// table_add_remove_many let dense = &mut self.dense;
|
|
// let indices = &mut self.indices;
|
|
// let dense_index = *self.sparse.get_or_insert_with(index.clone(), move || {
|
|
// if dense.len() == dense.capacity() {
|
|
// dense.reserve(64);
|
|
// indices.reserve(64);
|
|
// }
|
|
// let len = dense.len();
|
|
// // SAFE: we set the index immediately
|
|
// unsafe {
|
|
// dense.set_len(len + 1);
|
|
// indices.set_len(len + 1);
|
|
// }
|
|
// len
|
|
// });
|
|
// // SAFE: index either already existed or was just allocated
|
|
// unsafe {
|
|
// *self.dense.get_unchecked_mut(dense_index) = value;
|
|
// *self.indices.get_unchecked_mut(dense_index) = index;
|
|
// }
|
|
}
|
|
|
|
pub fn get_or_insert_with(&mut self, index: I, func: impl FnOnce() -> V) -> &mut V {
|
|
if let Some(dense_index) = self.sparse.get(index.clone()).cloned() {
|
|
// SAFE: dense indices stored in self.sparse always exist
|
|
unsafe { self.dense.get_unchecked_mut(dense_index) }
|
|
} else {
|
|
let value = func();
|
|
let dense_index = self.dense.len();
|
|
self.sparse.insert(index.clone(), dense_index);
|
|
self.indices.push(index);
|
|
self.dense.push(value);
|
|
// SAFE: dense index was just populated above
|
|
unsafe { self.dense.get_unchecked_mut(dense_index) }
|
|
}
|
|
}
|
|
|
|
#[inline]
|
|
pub fn len(&self) -> usize {
|
|
self.dense.len()
|
|
}
|
|
|
|
#[inline]
|
|
pub fn is_empty(&self) -> bool {
|
|
self.dense.len() == 0
|
|
}
|
|
|
|
#[inline]
|
|
pub fn contains(&self, index: I) -> bool {
|
|
self.sparse.contains(index)
|
|
}
|
|
|
|
pub fn get(&self, index: I) -> Option<&V> {
|
|
self.sparse.get(index).map(|dense_index| {
|
|
// SAFE: if the sparse index points to something in the dense vec, it exists
|
|
unsafe { self.dense.get_unchecked(*dense_index) }
|
|
})
|
|
}
|
|
|
|
pub fn get_mut(&mut self, index: I) -> Option<&mut V> {
|
|
let dense = &mut self.dense;
|
|
self.sparse.get(index).map(move |dense_index| {
|
|
// SAFE: if the sparse index points to something in the dense vec, it exists
|
|
unsafe { dense.get_unchecked_mut(*dense_index) }
|
|
})
|
|
}
|
|
|
|
pub fn remove(&mut self, index: I) -> Option<V> {
|
|
self.sparse.remove(index).map(|dense_index| {
|
|
let is_last = dense_index == self.dense.len() - 1;
|
|
let value = self.dense.swap_remove(dense_index);
|
|
self.indices.swap_remove(dense_index);
|
|
if !is_last {
|
|
let swapped_index = self.indices[dense_index].clone();
|
|
*self.sparse.get_mut(swapped_index).unwrap() = dense_index;
|
|
}
|
|
value
|
|
})
|
|
}
|
|
|
|
pub fn indices(&self) -> impl Iterator<Item = I> + '_ {
|
|
self.indices.iter().cloned()
|
|
}
|
|
|
|
pub fn values(&self) -> impl Iterator<Item = &V> {
|
|
self.dense.iter()
|
|
}
|
|
|
|
pub fn values_mut(&mut self) -> impl Iterator<Item = &mut V> {
|
|
self.dense.iter_mut()
|
|
}
|
|
}
|
|
|
|
pub trait SparseSetIndex: Clone + PartialEq + Eq + Hash {
|
|
fn sparse_set_index(&self) -> usize;
|
|
fn get_sparse_set_index(value: usize) -> Self;
|
|
}
|
|
|
|
macro_rules! impl_sparse_set_index {
|
|
($($ty:ty),+) => {
|
|
$(impl SparseSetIndex for $ty {
|
|
fn sparse_set_index(&self) -> usize {
|
|
*self as usize
|
|
}
|
|
|
|
fn get_sparse_set_index(value: usize) -> Self {
|
|
value as $ty
|
|
}
|
|
})*
|
|
};
|
|
}
|
|
|
|
impl_sparse_set_index!(u8, u16, u32, u64, usize);
|
|
|
|
/// A collection of [`ComponentSparseSet`] storages, indexed by [`ComponentId`]
|
|
///
|
|
/// Can be accessed via [`Storages`](crate::storage::Storages)
|
|
#[derive(Default)]
|
|
pub struct SparseSets {
|
|
sets: SparseSet<ComponentId, ComponentSparseSet>,
|
|
}
|
|
|
|
impl SparseSets {
|
|
pub fn get_or_insert(&mut self, component_info: &ComponentInfo) -> &mut ComponentSparseSet {
|
|
if !self.sets.contains(component_info.id()) {
|
|
self.sets.insert(
|
|
component_info.id(),
|
|
ComponentSparseSet::new(component_info, 64),
|
|
);
|
|
}
|
|
|
|
self.sets.get_mut(component_info.id()).unwrap()
|
|
}
|
|
|
|
pub fn get(&self, component_id: ComponentId) -> Option<&ComponentSparseSet> {
|
|
self.sets.get(component_id)
|
|
}
|
|
|
|
pub fn get_mut(&mut self, component_id: ComponentId) -> Option<&mut ComponentSparseSet> {
|
|
self.sets.get_mut(component_id)
|
|
}
|
|
|
|
pub fn clear(&mut self) {
|
|
for set in self.sets.values_mut() {
|
|
set.clear();
|
|
}
|
|
}
|
|
|
|
pub(crate) fn check_change_ticks(&mut self, change_tick: u32) {
|
|
for set in self.sets.values_mut() {
|
|
set.check_change_ticks(change_tick);
|
|
}
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use crate::{entity::Entity, storage::SparseSet};
|
|
|
|
#[derive(Debug, Eq, PartialEq)]
|
|
struct Foo(usize);
|
|
|
|
#[test]
|
|
fn sparse_set() {
|
|
let mut set = SparseSet::<Entity, Foo>::default();
|
|
let e0 = Entity::from_raw(0);
|
|
let e1 = Entity::from_raw(1);
|
|
let e2 = Entity::from_raw(2);
|
|
let e3 = Entity::from_raw(3);
|
|
let e4 = Entity::from_raw(4);
|
|
|
|
set.insert(e1, Foo(1));
|
|
set.insert(e2, Foo(2));
|
|
set.insert(e3, Foo(3));
|
|
|
|
assert_eq!(set.get(e0), None);
|
|
assert_eq!(set.get(e1), Some(&Foo(1)));
|
|
assert_eq!(set.get(e2), Some(&Foo(2)));
|
|
assert_eq!(set.get(e3), Some(&Foo(3)));
|
|
assert_eq!(set.get(e4), None);
|
|
|
|
{
|
|
let iter_results = set.values().collect::<Vec<_>>();
|
|
assert_eq!(iter_results, vec![&Foo(1), &Foo(2), &Foo(3)]);
|
|
}
|
|
|
|
assert_eq!(set.remove(e2), Some(Foo(2)));
|
|
assert_eq!(set.remove(e2), None);
|
|
|
|
assert_eq!(set.get(e0), None);
|
|
assert_eq!(set.get(e1), Some(&Foo(1)));
|
|
assert_eq!(set.get(e2), None);
|
|
assert_eq!(set.get(e3), Some(&Foo(3)));
|
|
assert_eq!(set.get(e4), None);
|
|
|
|
assert_eq!(set.remove(e1), Some(Foo(1)));
|
|
|
|
assert_eq!(set.get(e0), None);
|
|
assert_eq!(set.get(e1), None);
|
|
assert_eq!(set.get(e2), None);
|
|
assert_eq!(set.get(e3), Some(&Foo(3)));
|
|
assert_eq!(set.get(e4), None);
|
|
|
|
set.insert(e1, Foo(10));
|
|
|
|
assert_eq!(set.get(e1), Some(&Foo(10)));
|
|
|
|
*set.get_mut(e1).unwrap() = Foo(11);
|
|
assert_eq!(set.get(e1), Some(&Foo(11)));
|
|
}
|
|
}
|