Mirrors/bevy
2
0
Fork 0
mirror of https://github.com/bevyengine/bevy synced 2024-11-10 07:04:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Optimize observer unregistration (#15150)

Browse source 
# Objective

Fixes #14980

## Solution

Only iterate over archetypes containing the component.

## Alternatives

Additionally, for each archetype, cache how many observers are watching
one of its components & use this to speed up the check for each affected
archetype ([implemented
here](55c89aa033)).
Benchmarking showed this to lead only to a minor speedup.

## Testing

There's both already a test checking that observers don't run after
being despawned as well as a regression test for the bug that
necessitates the check this PR optimizes.
This commit is contained in:
SpecificProtagonist 2024-09-13 17:47:24 +02:00 committed by GitHub
parent c454db88a3
commit f570f52aa2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
crates/bevy_ecs/src/archetype.rs
View file

@ -766,7 +766,7 @@ pub struct Archetypes {
/// find the archetype id by the archetype's components /// find the archetype id by the archetype's components
by_components: HashMap<ArchetypeComponents, ArchetypeId>, by_components: HashMap<ArchetypeComponents, ArchetypeId>,
/// find all the archetypes that contain a component /// find all the archetypes that contain a component
by_component: ComponentIndex, pub(crate) by_component: ComponentIndex,
} }
/// Metadata about how a component is stored in an [`Archetype`]. /// Metadata about how a component is stored in an [`Archetype`].

17
crates/bevy_ecs/src/observer/mod.rs
View file

@ -456,14 +456,17 @@ impl World {
if observers.map.is_empty() && observers.entity_map.is_empty() { if observers.map.is_empty() && observers.entity_map.is_empty() {
cache.component_observers.remove(component); cache.component_observers.remove(component);
if let Some(flag) = Observers::is_archetype_cached(event_type) { if let Some(flag) = Observers::is_archetype_cached(event_type) {
for archetype in &mut archetypes.archetypes { if let Some(by_component) = archetypes.by_component.get(component) {
if archetype.contains(*component) { for archetype in by_component.keys() {
let no_longer_observed = archetype let archetype = &mut archetypes.archetypes[archetype.index()];
.components() if archetype.contains(*component) {
.all(|id| !cache.component_observers.contains_key(&id)); let no_longer_observed = archetype
.components()
.all(|id| !cache.component_observers.contains_key(&id));
if no_longer_observed { if no_longer_observed {
archetype.flags.set(flag, false); archetype.flags.set(flag, false);
}
} }
} }
} }