Skip to content
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 by Bors] - add system information plugin and update relevant examples #5911

Closed
wants to merge 21 commits into from
Closed
Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
59ec59c
add system information plugin and update relevant examples
l1npengtul Sep 8, 2022
b7c5680
fix docs and typo
l1npengtul Sep 8, 2022
0059b34
Merge branch 'main' into sys-usage-info
l1npengtul Dec 1, 2022
ca5b05a
Merge branch 'bevyengine:main' into sys-usage-info
l1npengtul Dec 2, 2022
19b6f31
fix messed up cargo toml
l1npengtul Dec 2, 2022
28dee0e
Update crates/bevy_diagnostic/src/system_information_diagnostics_plug…
l1npengtul Dec 3, 2022
a110617
Merge branch 'bevyengine:main' into sys-usage-info
l1npengtul Dec 23, 2022
c008554
simplify cargo toml according to 5454
l1npengtul Dec 23, 2022
38e8442
implement suggestions, remove sus (very sad)
l1npengtul Dec 23, 2022
2792d23
Merge branch 'main' into sys-usage-info
l1npengtul Dec 28, 2022
e9d174a
add ghost plugin
l1npengtul Dec 28, 2022
d6695eb
fix compile error, let me out of HS omori
l1npengtul Dec 28, 2022
a2f20bc
add warning about unsupporoted platforms on doc for plugin
l1npengtul Dec 28, 2022
08b5295
madotsuki you forgot to derive madotsuki no dont go to the balcony
l1npengtul Dec 28, 2022
7fc4b25
sunny removes the unused import warningand fixes the nonexistant syst…
l1npengtul Dec 28, 2022
1ae255e
add back #bevy
l1npengtul Dec 28, 2022
59f3e4c
remove code duplication
IceSentry Dec 30, 2022
b37721a
clean up
IceSentry Dec 30, 2022
888c26c
Merge pull request #1 from IceSentry/log-sysinfo-usage
l1npengtul Dec 30, 2022
c51e9fc
fix cfg sys usage
IceSentry Jan 2, 2023
4cc8ab7
Merge pull request #2 from IceSentry/fix-sysuage-info
l1npengtul Jan 2, 2023
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
19 changes: 18 additions & 1 deletion crates/bevy_diagnostic/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,27 @@ keywords = ["bevy"]


[dependencies]
# bevy
l1npengtul marked this conversation as resolved.
Show resolved Hide resolved
bevy_app = { path = "../bevy_app", version = "0.9.0" }
bevy_core = { path = "../bevy_core", version = "0.9.0" }
bevy_ecs = { path = "../bevy_ecs", version = "0.9.0" }
bevy_log = { path = "../bevy_log", version = "0.9.0" }
bevy_time = { path = "../bevy_time", version = "0.9.0" }
bevy_utils = { path = "../bevy_utils", version = "0.9.0" }

# iOS or MacOS
[target.'cfg(any(target_os="ios",target_os="macos"))'.dependencies.sysinfo]
version = "0.26.8"
features = ["apple-app-store"]
default-features = false

# use the unknown ci feature for RPi
[target.'cfg(all(target_os="linux",any(target_arch="aarch64",target_arch="arm")))'.dependencies.sysinfo]
version = "0.26.8"
features = [
"unknown-ci",
] # this features prevents linking to the C interface, which causes the build issues
default-features = false

# general case
[dependencies.sysinfo]
version = "0.26.8"
6 changes: 4 additions & 2 deletions crates/bevy_diagnostic/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@ mod diagnostic;
mod entity_count_diagnostics_plugin;
mod frame_time_diagnostics_plugin;
mod log_diagnostics_plugin;
mod system_information_diagnostics_plugin;

use bevy_app::prelude::*;
pub use diagnostic::*;
pub use entity_count_diagnostics_plugin::EntityCountDiagnosticsPlugin;
pub use frame_time_diagnostics_plugin::FrameTimeDiagnosticsPlugin;
pub use log_diagnostics_plugin::LogDiagnosticsPlugin;

use bevy_app::prelude::*;
pub use system_information_diagnostics_plugin::SystemInformationDiagnosticsPlugin;

/// Adds core diagnostics resources to an App.
#[derive(Default)]
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
use crate::{Diagnostic, DiagnosticId, Diagnostics};
use bevy_app::{App, Plugin};
use bevy_ecs::prelude::{ResMut, Resource};
use sysinfo::{CpuExt, System, SystemExt};

#[derive(Resource)]
pub struct SystemInfo {
pub sys: System,
}

impl Default for SystemInfo {
fn default() -> Self {
SystemInfo {
sys: System::new_all(),
}
}
}

/// Adds a System Information Diagnostic, specifically `cpu_usage` (in %) and `mem_usage` (in %)
#[derive(Default)]
pub struct SystemInformationDiagnosticsPlugin;

impl Plugin for SystemInformationDiagnosticsPlugin {
fn build(&self, app: &mut App) {
app.insert_resource(SystemInfo::default());
app.add_startup_system(Self::setup_system)
.add_system(Self::diagnostic_system);
}
}

impl SystemInformationDiagnosticsPlugin {
pub const CPU_USAGE: DiagnosticId =
DiagnosticId::from_u128(78494871623549551581510633532637320956);
pub const MEM_USAGE: DiagnosticId =
DiagnosticId::from_u128(42846254859293759601295317811892519825);

pub fn setup_system(mut diagnostics: ResMut<Diagnostics>) {
diagnostics.add(Diagnostic::new(Self::CPU_USAGE, "cpu_usage", 20).with_suffix("%"));
diagnostics.add(Diagnostic::new(Self::MEM_USAGE, "mem_usage", 20).with_suffix("%"));
}

pub fn diagnostic_system(
mut diagnostics: ResMut<Diagnostics>,
mut susinfo: ResMut<SystemInfo>,
l1npengtul marked this conversation as resolved.
Show resolved Hide resolved
) {
susinfo.sys.refresh_cpu();
susinfo.sys.refresh_memory();
let current_cpu_usage = {
let mut usage = 0.0;
let cpus = susinfo.sys.cpus();
for cpu in cpus {
usage += cpu.cpu_usage(); // note for future maintainers: this returns a value from 0.0 to 100.0
}
// average
usage / cpus.len() as f32
};
let total_mem = susinfo.sys.total_memory() as f64 / 1073741824_f64; // `memory()` fns return a value in bytes
let used_mem = susinfo.sys.used_memory() as f64 / 1073741824_f64;
l1npengtul marked this conversation as resolved.
Show resolved Hide resolved
let current_used_mem = used_mem / total_mem * 100.0;

diagnostics.add_measurement(Self::CPU_USAGE, || current_cpu_usage as f64);
diagnostics.add_measurement(Self::MEM_USAGE, || current_used_mem as f64);
l1npengtul marked this conversation as resolved.
Show resolved Hide resolved
}
}
2 changes: 2 additions & 0 deletions examples/diagnostics/log_diagnostics.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,7 @@ fn main() {
// .add_plugin(bevy::diagnostic::EntityCountDiagnosticsPlugin::default())
// Uncomment this to add an asset count diagnostics:
// .add_plugin(bevy::asset::diagnostic::AssetCountDiagnosticsPlugin::<Texture>::default())
// Uncomment this to add system info diagnostics:
// .add_plugin(bevy::diagnostic::SystemInformationDiagnosticsPlugin::default())
.run();
}