Skip to content

Add process cpu/memory usage to SystemInformationDiagnosticsPlugin #18279

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.

Sign up for GitHub

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 4 commits into from
Mar 16, 2025
Merged

Add process cpu/memory usage to SystemInformationDiagnosticsPlugin #18279

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7ceb044
Add process cpu/memory usage to SystemInformationDiagnosticsPlugin
tjlaxs Mar 12, 2025
ce87935
Memory suffix to MB and cpu usage to 0-100%
tjlaxs Mar 12, 2025
ad8d806
Renaming old cpu/mem usages to be more specific and consistent
tjlaxs Mar 12, 2025
79fc8c5
Fixing the bytes to gib conversions
tjlaxs Mar 12, 2025
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
34 changes: 34 additions & 0 deletions crates/bevy_diagnostic/src/system_information_diagnostics_plugin.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@ impl SystemInformationDiagnosticsPlugin {
pub const CPU_USAGE: DiagnosticPath = DiagnosticPath::const_new("system/cpu_usage");
/// Total system memory usage in %
pub const MEM_USAGE: DiagnosticPath = DiagnosticPath::const_new("system/mem_usage");
/// Process cpu usage in %
pub const PROCESS_CPU_USAGE: DiagnosticPath = DiagnosticPath::const_new("process/cpu_usage");
/// Process memory usage in %
pub const PROCESS_MEM_USAGE: DiagnosticPath = DiagnosticPath::const_new("process/mem_usage");
}

/// A resource that stores diagnostic information about the system.
Expand Down Expand Up @@ -94,11 +98,19 @@ pub mod internal {
.add(Diagnostic::new(SystemInformationDiagnosticsPlugin::CPU_USAGE).with_suffix("%"));
diagnostics
.add(Diagnostic::new(SystemInformationDiagnosticsPlugin::MEM_USAGE).with_suffix("%"));
diagnostics.add(
Diagnostic::new(SystemInformationDiagnosticsPlugin::PROCESS_CPU_USAGE).with_suffix("%"),
);
diagnostics.add(
Diagnostic::new(SystemInformationDiagnosticsPlugin::PROCESS_MEM_USAGE).with_suffix("%"),
);
}

struct SysinfoRefreshData {
current_cpu_usage: f64,
current_used_mem: f64,
process_cpu_usage: f64,
process_mem_usage: f64,
}

#[derive(Resource, Default)]
Expand Down Expand Up @@ -135,6 +147,8 @@ pub mod internal {
let sys = Arc::clone(sysinfo);
let task = thread_pool.spawn(async move {
let mut sys = sys.lock().unwrap();
let pid = sysinfo::get_current_pid().expect("Failed to get current process ID");
sys.refresh_processes(sysinfo::ProcessesToUpdate::Some(&[pid]), true);

sys.refresh_cpu_specifics(CpuRefreshKind::nothing().with_cpu_usage());
sys.refresh_memory();
Expand All @@ -144,9 +158,21 @@ pub mod internal {
let used_mem = sys.used_memory() as f64 / BYTES_TO_GIB;
let current_used_mem = used_mem / total_mem * 100.0;

let process_mem_usage = sys
.process(pid)
.map(|p| p.memory() as f64 / 1024.0 / 1024.0) // Convert to MB
.unwrap_or(0.0);

let process_cpu_usage = sys
.process(pid)
.map(|p| p.cpu_usage() as f64)
.unwrap_or(0.0);

SysinfoRefreshData {
current_cpu_usage,
current_used_mem,
process_cpu_usage,
process_mem_usage,
}
});
tasks.tasks.push(task);
Expand All @@ -166,6 +192,14 @@ pub mod internal {
diagnostics.add_measurement(&SystemInformationDiagnosticsPlugin::MEM_USAGE, || {
data.current_used_mem
});
diagnostics.add_measurement(
&SystemInformationDiagnosticsPlugin::PROCESS_CPU_USAGE,
|| data.process_cpu_usage,
);
diagnostics.add_measurement(
&SystemInformationDiagnosticsPlugin::PROCESS_MEM_USAGE,
|| data.process_mem_usage,
);
false
});
}
Expand Down