Skip to content

feat: add allocator diagnostics #305

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 22, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 42 additions & 3 deletions crates/bevy_mod_scripting_core/src/bindings/allocator.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
//! An allocator used to control the lifetime of allocations

use bevy::{ecs::system::Resource, prelude::ResMut, reflect::PartialReflect};
use bevy::{
app::{App, Plugin, PostUpdate},
diagnostic::{Diagnostic, DiagnosticPath, Diagnostics, RegisterDiagnostic},
ecs::system::{Res, Resource},
prelude::ResMut,
reflect::PartialReflect,
};
use parking_lot::{RwLock, RwLockReadGuard, RwLockWriteGuard};
use std::{
cell::UnsafeCell,
Expand All @@ -11,6 +17,14 @@ use std::{
sync::{atomic::AtomicU64, Arc},
};

/// The path used for the total number of allocations diagnostic
pub const ALLOCATOR_TOTAL_DIAG_PATH: DiagnosticPath =
DiagnosticPath::const_new("scripting_allocator_total");

/// The path used for the total number of deallocated allocations diagnostic
pub const ALLOCATOR_TOTAL_COLLECTED_DIAG_PATH: DiagnosticPath =
DiagnosticPath::const_new("scripting_allocator_total_collected");

#[derive(Clone, Debug)]
/// Unique identifier for an allocation
pub struct ReflectAllocationId(pub(crate) Arc<u64>);
Expand Down Expand Up @@ -214,9 +228,34 @@ impl ReflectAllocator {

/// Cleans up dangling script allocations
#[profiling::function]
pub fn garbage_collector(allocator: ResMut<AppReflectAllocator>) {
pub fn garbage_collector(allocator: ResMut<AppReflectAllocator>, mut diagnostics: Diagnostics) {
let mut allocator = allocator.write();
allocator.clean_garbage_allocations()
let before = allocator.allocations.len();
allocator.clean_garbage_allocations();
let after = allocator.allocations.len();
diagnostics.add_measurement(&ALLOCATOR_TOTAL_DIAG_PATH, || after as f64);
diagnostics.add_measurement(&ALLOCATOR_TOTAL_COLLECTED_DIAG_PATH, || {
(before - after) as f64
});
}

/// Measures the number of allocations in the allocator and other diagnostics when enabled
pub fn measure_allocations(allocator: Res<AppReflectAllocator>, mut diagnostics: Diagnostics) {
let allocator = allocator.read();
let allocations_count = allocator.allocations.len();
diagnostics.add_measurement(&ALLOCATOR_TOTAL_DIAG_PATH, || allocations_count as f64);
}

/// A plugin which registers various allocator diagnostics
pub struct AllocatorDiagnosticPlugin;
impl Plugin for AllocatorDiagnosticPlugin {
fn build(&self, app: &mut App) {
app.register_diagnostic(Diagnostic::new(ALLOCATOR_TOTAL_DIAG_PATH).with_suffix(" allocs"))
.register_diagnostic(
Diagnostic::new(ALLOCATOR_TOTAL_COLLECTED_DIAG_PATH).with_suffix(" deallocs"),
)
.add_systems(PostUpdate, measure_allocations);
}
}

#[cfg(test)]
Expand Down
12 changes: 12 additions & 0 deletions examples/game_of_life.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
#![allow(deprecated)]

use std::time::Duration;

use bevy::{
diagnostic::LogDiagnosticsPlugin,
image::ImageSampler,
log::LogPlugin,
prelude::*,
Expand All @@ -18,6 +21,7 @@ use bevy_mod_scripting_core::{
bindings::{
function::namespace::{GlobalNamespace, NamespaceBuilder},
script_value::ScriptValue,
AllocatorDiagnosticPlugin,
},
callback_labels,
commands::AddStaticScript,
Expand Down Expand Up @@ -325,6 +329,14 @@ fn main() -> std::io::Result<()> {
console_app(&mut app);
game_of_life_app(&mut app);

app.add_plugins((
AllocatorDiagnosticPlugin,
LogDiagnosticsPlugin {
wait_duration: Duration::from_secs(60),
..Default::default()
},
));

app.run();

Ok(())
Expand Down
Loading