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

Stageless: move final apply outside of spawned executor (#7445)

Browse Source 
# Objective

- After the multithreaded executor finishes running all the systems, we apply the buffers for any system that hasn't applied it's buffers. This is a courtesy apply for users who forget to order their systems before a apply_system_buffers. When checking stageless, it was found that this apply_system_buffers was running on the executor thread instead of the world's thread. This is a problem because anything with world access should be able to access nonsend resources.

## Solution

- Move the final apply_system_buffers outside of the executor and outside of the scope, so it runs on the same thread that schedule.run is called on.
This commit is contained in:
Mike 2023-02-03 02:35:20 +00:00
parent 36320762f4
commit 27e20df6de
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -178,19 +178,6 @@ impl SystemExecutor for MultiThreadedExecutor {
self.rebuild_active_access(); self.rebuild_active_access();
} }
} }
// SAFETY: all systems have completed
let world = unsafe { &mut *world.get() };
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.running_systems.is_clear());
self.active_access.clear();
self.evaluated_sets.clear();
self.skipped_systems.clear();
self.completed_systems.clear();
}; };
#[cfg(feature = "trace")] #[cfg(feature = "trace")]
@ -199,6 +186,20 @@ impl SystemExecutor for MultiThreadedExecutor {
let executor = executor.instrument(executor_span); let executor = executor.instrument(executor_span);
scope.spawn(executor); scope.spawn(executor);
}); });
// Do one final apply buffers after all systems have completed
// SAFETY: all systems have completed, and so no outstanding accesses remain
let world = unsafe { &mut *world.get() };
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.running_systems.is_clear());
self.active_access.clear();
self.evaluated_sets.clear();
self.skipped_systems.clear();
self.completed_systems.clear();
} }
} }