forestia/bevy
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Stageless: fix unapplied systems (#7446)

Browse Source 
# Objective

- The stageless executor keeps track of systems that have run, but have not applied their system buffers. The bitset for that was being cloned into apply_system_buffers and cleared in that function, but we need to clear the original version instead of the cloned version

## Solution

- move the clear out of the apply_system_buffers function.

Co-authored-by: Carter Anderson <mcanders1@gmail.com>
This commit is contained in:
Mike 2023-02-03 01:20:11 +00:00
parent 9481a2c8a7
commit 3ff68b6ddb
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
crates/bevy_ecs/src/schedule_v3/executor/multi_threaded.rs
View File

@ -181,11 +181,12 @@ impl SystemExecutor for MultiThreadedExecutor {
// SAFETY: all systems have completed // SAFETY: all systems have completed
let world = unsafe { &mut *world.get() }; let world = unsafe { &mut *world.get() };
apply_system_buffers(&mut self.unapplied_systems, systems, world); apply_system_buffers(&self.unapplied_systems, systems, world);
self.unapplied_systems.clear();
debug_assert!(self.unapplied_systems.is_clear());
debug_assert!(self.ready_systems.is_clear()); debug_assert!(self.ready_systems.is_clear());
debug_assert!(self.running_systems.is_clear()); debug_assert!(self.running_systems.is_clear());
debug_assert!(self.unapplied_systems.is_clear());
self.active_access.clear(); self.active_access.clear();
self.evaluated_sets.clear(); self.evaluated_sets.clear();
self.skipped_systems.clear(); self.skipped_systems.clear();
@ -459,11 +460,12 @@ impl MultiThreadedExecutor {
let sender = self.sender.clone(); let sender = self.sender.clone();
if is_apply_system_buffers(system) { if is_apply_system_buffers(system) {
// TODO: avoid allocation // TODO: avoid allocation
let mut unapplied_systems = self.unapplied_systems.clone(); let unapplied_systems = self.unapplied_systems.clone();
self.unapplied_systems.clear();
let task = async move { let task = async move {
#[cfg(feature = "trace")] #[cfg(feature = "trace")]
let system_guard = system_span.enter(); let system_guard = system_span.enter();
apply_system_buffers(&mut unapplied_systems, systems, world); apply_system_buffers(&unapplied_systems, systems, world);
#[cfg(feature = "trace")] #[cfg(feature = "trace")]
drop(system_guard); drop(system_guard);
sender sender
@ -545,7 +547,7 @@ impl MultiThreadedExecutor {
} }
fn apply_system_buffers( fn apply_system_buffers(
unapplied_systems: &mut FixedBitSet, unapplied_systems: &FixedBitSet,
systems: &[SyncUnsafeCell<BoxedSystem>], systems: &[SyncUnsafeCell<BoxedSystem>],
world: &mut World, world: &mut World,
) { ) {
@ -556,8 +558,6 @@ fn apply_system_buffers(
let _apply_buffers_span = info_span!("apply_buffers", name = &*system.name()).entered(); let _apply_buffers_span = info_span!("apply_buffers", name = &*system.name()).entered();
system.apply_buffers(world); system.apply_buffers(world);
} }
unapplied_systems.clear();
} }
fn evaluate_and_fold_conditions(conditions: &mut [BoxedCondition], world: &World) -> bool { fn evaluate_and_fold_conditions(conditions: &mut [BoxedCondition], world: &World) -> bool {