
# Objective Fix "system skipped" warnings when validation fails on systems that wouldn't run because of run conditions. ## Solution > I think the error is from a system defined as: > > ```rust > no_gpu_preprocessing::batch_and_prepare_sorted_render_phase::<SPI, GFBD> > .run_if(resource_exists::<BatchedInstanceBuffer<GFBD::BufferData>>), > ``` > > So the `run_if` was preventing the panics. Maybe we need to skip validation if `!system_conditions_met`, or at least silence the warning in that case. *By @chescock in https://discord.com/channels/691052431525675048/692572690833473578/1287865365312831562* Validation of system is skipped if the system was already skipped by run conditions. ## Testing Ran alien addict example, no more warnings.
162 lines
5.5 KiB
Rust
162 lines
5.5 KiB
Rust
#[cfg(feature = "trace")]
|
|
use bevy_utils::tracing::info_span;
|
|
use fixedbitset::FixedBitSet;
|
|
use std::panic::AssertUnwindSafe;
|
|
|
|
use crate::{
|
|
schedule::{
|
|
executor::is_apply_deferred, BoxedCondition, ExecutorKind, SystemExecutor, SystemSchedule,
|
|
},
|
|
warn_system_skipped,
|
|
world::World,
|
|
};
|
|
|
|
use super::__rust_begin_short_backtrace;
|
|
|
|
/// A variant of [`SingleThreadedExecutor`](crate::schedule::SingleThreadedExecutor) that calls
|
|
/// [`apply_deferred`](crate::system::System::apply_deferred) immediately after running each system.
|
|
#[derive(Default)]
|
|
pub struct SimpleExecutor {
|
|
/// Systems sets whose conditions have been evaluated.
|
|
evaluated_sets: FixedBitSet,
|
|
/// Systems that have run or been skipped.
|
|
completed_systems: FixedBitSet,
|
|
}
|
|
|
|
impl SystemExecutor for SimpleExecutor {
|
|
fn kind(&self) -> ExecutorKind {
|
|
ExecutorKind::Simple
|
|
}
|
|
|
|
fn init(&mut self, schedule: &SystemSchedule) {
|
|
let sys_count = schedule.system_ids.len();
|
|
let set_count = schedule.set_ids.len();
|
|
self.evaluated_sets = FixedBitSet::with_capacity(set_count);
|
|
self.completed_systems = FixedBitSet::with_capacity(sys_count);
|
|
}
|
|
|
|
fn run(
|
|
&mut self,
|
|
schedule: &mut SystemSchedule,
|
|
world: &mut World,
|
|
_skip_systems: Option<&FixedBitSet>,
|
|
) {
|
|
// If stepping is enabled, make sure we skip those systems that should
|
|
// not be run.
|
|
#[cfg(feature = "bevy_debug_stepping")]
|
|
if let Some(skipped_systems) = _skip_systems {
|
|
// mark skipped systems as completed
|
|
self.completed_systems |= skipped_systems;
|
|
}
|
|
|
|
for system_index in 0..schedule.systems.len() {
|
|
#[cfg(feature = "trace")]
|
|
let name = schedule.systems[system_index].name();
|
|
#[cfg(feature = "trace")]
|
|
let should_run_span = info_span!("check_conditions", name = &*name).entered();
|
|
|
|
let mut should_run = !self.completed_systems.contains(system_index);
|
|
for set_idx in schedule.sets_with_conditions_of_systems[system_index].ones() {
|
|
if self.evaluated_sets.contains(set_idx) {
|
|
continue;
|
|
}
|
|
|
|
// evaluate system set's conditions
|
|
let set_conditions_met =
|
|
evaluate_and_fold_conditions(&mut schedule.set_conditions[set_idx], world);
|
|
|
|
if !set_conditions_met {
|
|
self.completed_systems
|
|
.union_with(&schedule.systems_in_sets_with_conditions[set_idx]);
|
|
}
|
|
|
|
should_run &= set_conditions_met;
|
|
self.evaluated_sets.insert(set_idx);
|
|
}
|
|
|
|
// evaluate system's conditions
|
|
let system_conditions_met =
|
|
evaluate_and_fold_conditions(&mut schedule.system_conditions[system_index], world);
|
|
|
|
should_run &= system_conditions_met;
|
|
|
|
let system = &mut schedule.systems[system_index];
|
|
if should_run {
|
|
let valid_params = system.validate_param(world);
|
|
if !valid_params {
|
|
warn_system_skipped!("System", system.name());
|
|
}
|
|
should_run &= valid_params;
|
|
}
|
|
|
|
#[cfg(feature = "trace")]
|
|
should_run_span.exit();
|
|
|
|
// system has either been skipped or will run
|
|
self.completed_systems.insert(system_index);
|
|
|
|
if !should_run {
|
|
continue;
|
|
}
|
|
|
|
if is_apply_deferred(system) {
|
|
continue;
|
|
}
|
|
|
|
let res = std::panic::catch_unwind(AssertUnwindSafe(|| {
|
|
__rust_begin_short_backtrace::run(&mut **system, world);
|
|
}));
|
|
if let Err(payload) = res {
|
|
eprintln!("Encountered a panic in system `{}`!", &*system.name());
|
|
std::panic::resume_unwind(payload);
|
|
}
|
|
}
|
|
|
|
self.evaluated_sets.clear();
|
|
self.completed_systems.clear();
|
|
}
|
|
|
|
fn set_apply_final_deferred(&mut self, _: bool) {
|
|
// do nothing. simple executor does not do a final sync
|
|
}
|
|
}
|
|
|
|
impl SimpleExecutor {
|
|
/// Creates a new simple executor for use in a [`Schedule`](crate::schedule::Schedule).
|
|
/// This calls each system in order and immediately calls [`System::apply_deferred`](crate::system::System::apply_deferred).
|
|
pub const fn new() -> Self {
|
|
Self {
|
|
evaluated_sets: FixedBitSet::new(),
|
|
completed_systems: FixedBitSet::new(),
|
|
}
|
|
}
|
|
}
|
|
|
|
fn evaluate_and_fold_conditions(conditions: &mut [BoxedCondition], world: &mut World) -> bool {
|
|
// not short-circuiting is intentional
|
|
#[allow(clippy::unnecessary_fold)]
|
|
conditions
|
|
.iter_mut()
|
|
.map(|condition| {
|
|
if !condition.validate_param(world) {
|
|
warn_system_skipped!("Condition", condition.name());
|
|
return false;
|
|
}
|
|
__rust_begin_short_backtrace::readonly_run(&mut **condition, world)
|
|
})
|
|
.fold(true, |acc, res| acc && res)
|
|
}
|
|
|
|
#[cfg(test)]
|
|
#[test]
|
|
fn skip_automatic_sync_points() {
|
|
// Schedules automatically insert apply_deferred systems, but these should
|
|
// not be executed as they only serve as markers and are not initialized
|
|
use crate::prelude::*;
|
|
let mut sched = Schedule::default();
|
|
sched.set_executor_kind(ExecutorKind::Simple);
|
|
sched.add_systems((|_: Commands| (), || ()).chain());
|
|
let mut world = World::new();
|
|
sched.run(&mut world);
|
|
}
|