Skip to content

Commit 50cbdd0

Browse files
committed
move final apply outside of spawned executor
1 parent 5d514fb commit 50cbdd0

File tree

1 file changed

+13
-12
lines changed

1 file changed

+13
-12
lines changed

crates/bevy_ecs/src/schedule_v3/executor/multi_threaded.rs

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -178,18 +178,6 @@ impl SystemExecutor for MultiThreadedExecutor {
178178
self.rebuild_active_access();
179179
}
180180
}
181-
182-
// SAFETY: all systems have completed
183-
let world = unsafe { &mut *world.get() };
184-
apply_system_buffers(&mut self.unapplied_systems, systems, world);
185-
186-
debug_assert!(self.ready_systems.is_clear());
187-
debug_assert!(self.running_systems.is_clear());
188-
debug_assert!(self.unapplied_systems.is_clear());
189-
self.active_access.clear();
190-
self.evaluated_sets.clear();
191-
self.skipped_systems.clear();
192-
self.completed_systems.clear();
193181
};
194182

195183
#[cfg(feature = "trace")]
@@ -198,6 +186,19 @@ impl SystemExecutor for MultiThreadedExecutor {
198186
let executor = executor.instrument(executor_span);
199187
scope.spawn(executor);
200188
});
189+
190+
// Do one final apply buffers after all systems have completed
191+
// SAFETY: all systems have completed, and so no outstanding accesses remain
192+
let world = unsafe { &mut *world.get() };
193+
apply_system_buffers(&mut self.unapplied_systems, systems, world);
194+
195+
debug_assert!(self.ready_systems.is_clear());
196+
debug_assert!(self.running_systems.is_clear());
197+
debug_assert!(self.unapplied_systems.is_clear());
198+
self.active_access.clear();
199+
self.evaluated_sets.clear();
200+
self.skipped_systems.clear();
201+
self.completed_systems.clear();
201202
}
202203
}
203204

0 commit comments

Comments
 (0)