From 9b00f26e2f7e013b56e99da3cd7bce8d7a30a56c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Mockers?= <mockersf@gmail.com>
Date: Fri, 18 Dec 2020 02:28:19 +0100
Subject: [PATCH 1/7] move print diagnostics to log

---
 Cargo.toml                                    |  4 +-
 crates/bevy_diagnostic/Cargo.toml             |  1 +
 crates/bevy_diagnostic/src/lib.rs             |  4 +-
 ...cs_plugin.rs => log_diagnostics_plugin.rs} | 57 +++++++++----------
 examples/3d/spawner.rs                        |  4 +-
 examples/README.md                            |  2 +-
 examples/app/plugin_group.rs                  |  2 +-
 examples/diagnostics/custom_diagnostic.rs     |  4 +-
 ...rint_diagnostics.rs => log_diagnostics.rs} |  4 +-
 9 files changed, 41 insertions(+), 41 deletions(-)
 rename crates/bevy_diagnostic/src/{print_diagnostics_plugin.rs => log_diagnostics_plugin.rs} (59%)
 rename examples/diagnostics/{print_diagnostics.rs => log_diagnostics.rs} (79%)

diff --git a/Cargo.toml b/Cargo.toml
index 207cd12341165..bac8fe0fd1456 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -190,8 +190,8 @@ name = "custom_diagnostic"
 path = "examples/diagnostics/custom_diagnostic.rs"
 
 [[example]]
-name = "print_diagnostics"
-path = "examples/diagnostics/print_diagnostics.rs"
+name = "log_diagnostics"
+path = "examples/diagnostics/log_diagnostics.rs"
 
 [[example]]
 name = "event"
diff --git a/crates/bevy_diagnostic/Cargo.toml b/crates/bevy_diagnostic/Cargo.toml
index 2b39528e295ef..c96f967c05f0e 100644
--- a/crates/bevy_diagnostic/Cargo.toml
+++ b/crates/bevy_diagnostic/Cargo.toml
@@ -18,6 +18,7 @@ keywords = ["bevy"]
 bevy_app = { path = "../bevy_app", version = "0.4.0" }
 bevy_core = { path = "../bevy_core", version = "0.4.0" }
 bevy_ecs = { path = "../bevy_ecs", version = "0.4.0" }
+bevy_log = { path = "../bevy_log", version = "0.4.0" }
 bevy_utils = { path = "../bevy_utils", version = "0.4.0" }
 
 # other
diff --git a/crates/bevy_diagnostic/src/lib.rs b/crates/bevy_diagnostic/src/lib.rs
index d54c32663ca62..44620b9193156 100644
--- a/crates/bevy_diagnostic/src/lib.rs
+++ b/crates/bevy_diagnostic/src/lib.rs
@@ -1,9 +1,9 @@
 mod diagnostic;
 mod frame_time_diagnostics_plugin;
-mod print_diagnostics_plugin;
+mod log_diagnostics_plugin;
 pub use diagnostic::*;
 pub use frame_time_diagnostics_plugin::FrameTimeDiagnosticsPlugin;
-pub use print_diagnostics_plugin::PrintDiagnosticsPlugin;
+pub use log_diagnostics_plugin::LogDiagnosticsPlugin;
 
 use bevy_app::prelude::*;
 
diff --git a/crates/bevy_diagnostic/src/print_diagnostics_plugin.rs b/crates/bevy_diagnostic/src/log_diagnostics_plugin.rs
similarity index 59%
rename from crates/bevy_diagnostic/src/print_diagnostics_plugin.rs
rename to crates/bevy_diagnostic/src/log_diagnostics_plugin.rs
index e71f4b9066634..dd4aeeea02344 100644
--- a/crates/bevy_diagnostic/src/print_diagnostics_plugin.rs
+++ b/crates/bevy_diagnostic/src/log_diagnostics_plugin.rs
@@ -2,24 +2,25 @@ use super::{Diagnostic, DiagnosticId, Diagnostics};
 use bevy_app::prelude::*;
 use bevy_core::{Time, Timer};
 use bevy_ecs::{IntoSystem, Res, ResMut};
+use bevy_log::{debug, info};
 use bevy_utils::Duration;
 
-/// An App Plugin that prints diagnostics to the console
-pub struct PrintDiagnosticsPlugin {
+/// An App Plugin that logs diagnostics to the console
+pub struct LogDiagnosticsPlugin {
     pub debug: bool,
     pub wait_duration: Duration,
     pub filter: Option<Vec<DiagnosticId>>,
 }
 
-/// State used by the [PrintDiagnosticsPlugin]
-pub struct PrintDiagnosticsState {
+/// State used by the [LogDiagnosticsPlugin]
+pub struct LogDiagnosticsState {
     timer: Timer,
     filter: Option<Vec<DiagnosticId>>,
 }
 
-impl Default for PrintDiagnosticsPlugin {
+impl Default for LogDiagnosticsPlugin {
     fn default() -> Self {
-        PrintDiagnosticsPlugin {
+        LogDiagnosticsPlugin {
             debug: false,
             wait_duration: Duration::from_secs(1),
             filter: None,
@@ -27,9 +28,9 @@ impl Default for PrintDiagnosticsPlugin {
     }
 }
 
-impl Plugin for PrintDiagnosticsPlugin {
+impl Plugin for LogDiagnosticsPlugin {
     fn build(&self, app: &mut bevy_app::AppBuilder) {
-        app.add_resource(PrintDiagnosticsState {
+        app.add_resource(LogDiagnosticsState {
             timer: Timer::new(self.wait_duration, true),
             filter: self.filter.clone(),
         });
@@ -37,68 +38,66 @@ impl Plugin for PrintDiagnosticsPlugin {
         if self.debug {
             app.add_system_to_stage(
                 stage::POST_UPDATE,
-                Self::print_diagnostics_debug_system.system(),
+                Self::log_diagnostics_debug_system.system(),
             );
         } else {
-            app.add_system_to_stage(stage::POST_UPDATE, Self::print_diagnostics_system.system());
+            app.add_system_to_stage(stage::POST_UPDATE, Self::log_diagnostics_system.system());
         }
     }
 }
 
-impl PrintDiagnosticsPlugin {
+impl LogDiagnosticsPlugin {
     pub fn filtered(filter: Vec<DiagnosticId>) -> Self {
-        PrintDiagnosticsPlugin {
+        LogDiagnosticsPlugin {
             filter: Some(filter),
             ..Default::default()
         }
     }
 
-    fn print_diagnostic(diagnostic: &Diagnostic) {
+    fn log_diagnostic(diagnostic: &Diagnostic) {
         if let Some(value) = diagnostic.value() {
-            print!("{:<65}: {:<10.6}", diagnostic.name, value);
             if let Some(average) = diagnostic.average() {
-                print!("  (avg {:.6})", average);
+                info!(
+                    "{:<65}: {:<10.6}  (avg {:.6})",
+                    diagnostic.name, value, average
+                );
+            } else {
+                info!("{:<65}: {:<10.6}", diagnostic.name, value);
             }
-
-            println!("\n");
         }
     }
 
-    pub fn print_diagnostics_system(
-        mut state: ResMut<PrintDiagnosticsState>,
+    pub fn log_diagnostics_system(
+        mut state: ResMut<LogDiagnosticsState>,
         time: Res<Time>,
         diagnostics: Res<Diagnostics>,
     ) {
         if state.timer.tick(time.delta_seconds()).finished() {
-            println!("Diagnostics:");
-            println!("{}", "-".repeat(93));
             if let Some(ref filter) = state.filter {
                 for diagnostic in filter.iter().map(|id| diagnostics.get(*id).unwrap()) {
-                    Self::print_diagnostic(diagnostic);
+                    Self::log_diagnostic(diagnostic);
                 }
             } else {
                 for diagnostic in diagnostics.iter() {
-                    Self::print_diagnostic(diagnostic);
+                    Self::log_diagnostic(diagnostic);
                 }
             }
         }
     }
 
-    pub fn print_diagnostics_debug_system(
-        mut state: ResMut<PrintDiagnosticsState>,
+    pub fn log_diagnostics_debug_system(
+        mut state: ResMut<LogDiagnosticsState>,
         time: Res<Time>,
         diagnostics: Res<Diagnostics>,
     ) {
         if state.timer.tick(time.delta_seconds()).finished() {
-            println!("Diagnostics (Debug):");
-            println!("{}", "-".repeat(93));
             if let Some(ref filter) = state.filter {
                 for diagnostic in filter.iter().map(|id| diagnostics.get(*id).unwrap()) {
-                    println!("{:#?}\n", diagnostic);
+                    debug!("{:#?}\n", diagnostic);
                 }
             } else {
                 for diagnostic in diagnostics.iter() {
-                    println!("{:#?}\n", diagnostic);
+                    debug!("{:#?}\n", diagnostic);
                 }
             }
         }
diff --git a/examples/3d/spawner.rs b/examples/3d/spawner.rs
index c2a5c7f045619..581776c355815 100644
--- a/examples/3d/spawner.rs
+++ b/examples/3d/spawner.rs
@@ -1,5 +1,5 @@
 use bevy::{
-    diagnostic::{FrameTimeDiagnosticsPlugin, PrintDiagnosticsPlugin},
+    diagnostic::{FrameTimeDiagnosticsPlugin, LogDiagnosticsPlugin},
     prelude::*,
 };
 use rand::{rngs::StdRng, Rng, SeedableRng};
@@ -12,7 +12,7 @@ fn main() {
     App::build()
         .add_plugins(DefaultPlugins)
         .add_plugin(FrameTimeDiagnosticsPlugin::default())
-        .add_plugin(PrintDiagnosticsPlugin::default())
+        .add_plugin(LogDiagnosticsPlugin::default())
         .add_startup_system(setup.system())
         .add_system(move_cubes.system())
         .run();
diff --git a/examples/README.md b/examples/README.md
index ae229238f9776..16a8b4d212427 100644
--- a/examples/README.md
+++ b/examples/README.md
@@ -108,7 +108,7 @@ Example | File | Description
 Example | File | Description
 --- | --- | ---
 `custom_diagnostic` | [`diagnostics/custom_diagnostic.rs`](./diagnostics/custom_diagnostic.rs) | Shows how to create a custom diagnostic
-`print_diagnostics` | [`diagnostics/print_diagnostics.rs`](./diagnostics/print_diagnostics.rs) | Add a plugin that prints diagnostics to the console
+`log_diagnostics` | [`diagnostics/log_diagnostics.rs`](./diagnostics/log_diagnostics.rs) | Add a plugin that logs diagnostics to the console
 
 ## ECS (Entity Component System)
 
diff --git a/examples/app/plugin_group.rs b/examples/app/plugin_group.rs
index 81cd0b2ef2201..7e0be8143b6b3 100644
--- a/examples/app/plugin_group.rs
+++ b/examples/app/plugin_group.rs
@@ -11,7 +11,7 @@ fn main() {
         // .add_plugins_with(HelloWorldPlugins, |group| {
         //     group
         //         .disable::<PrintWorldPlugin>()
-        //         .add_before::<PrintHelloPlugin, _>(bevy::diagnostic::PrintDiagnosticsPlugin::default())
+        //         .add_before::<PrintHelloPlugin, _>(bevy::diagnostic::LogDiagnosticsPlugin::default())
         // })
         .run();
 }
diff --git a/examples/diagnostics/custom_diagnostic.rs b/examples/diagnostics/custom_diagnostic.rs
index 4b2e832467a44..ea2eb59123eb5 100644
--- a/examples/diagnostics/custom_diagnostic.rs
+++ b/examples/diagnostics/custom_diagnostic.rs
@@ -1,5 +1,5 @@
 use bevy::{
-    diagnostic::{Diagnostic, DiagnosticId, Diagnostics, PrintDiagnosticsPlugin},
+    diagnostic::{Diagnostic, DiagnosticId, Diagnostics, LogDiagnosticsPlugin},
     prelude::*,
 };
 
@@ -8,7 +8,7 @@ fn main() {
     App::build()
         .add_plugins(DefaultPlugins)
         // The "print diagnostics" plugin is optional. It just visualizes our diagnostics in the console
-        .add_plugin(PrintDiagnosticsPlugin::default())
+        .add_plugin(LogDiagnosticsPlugin::default())
         .add_startup_system(setup_diagnostic_system.system())
         .add_system(my_system.system())
         .run();
diff --git a/examples/diagnostics/print_diagnostics.rs b/examples/diagnostics/log_diagnostics.rs
similarity index 79%
rename from examples/diagnostics/print_diagnostics.rs
rename to examples/diagnostics/log_diagnostics.rs
index 5ed9a5f108109..5ee84e11f8cf7 100644
--- a/examples/diagnostics/print_diagnostics.rs
+++ b/examples/diagnostics/log_diagnostics.rs
@@ -1,5 +1,5 @@
 use bevy::{
-    diagnostic::{FrameTimeDiagnosticsPlugin, PrintDiagnosticsPlugin},
+    diagnostic::{FrameTimeDiagnosticsPlugin, LogDiagnosticsPlugin},
     prelude::*,
 };
 
@@ -9,7 +9,7 @@ fn main() {
         // Adds frame time diagnostics
         .add_plugin(FrameTimeDiagnosticsPlugin::default())
         // Adds a system that prints diagnostics to the console
-        .add_plugin(PrintDiagnosticsPlugin::default())
+        .add_plugin(LogDiagnosticsPlugin::default())
         // Any plugin can register diagnostics
         // Uncomment this to add some render resource diagnostics:
         // .add_plugin(bevy::wgpu::diagnostic::WgpuResourceDiagnosticsPlugin::default())

From 20b8319cbcf31fee7539fdb53a7f3e263d28f509 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Mockers?= <mockersf@gmail.com>
Date: Fri, 18 Dec 2020 02:30:10 +0100
Subject: [PATCH 2/7] entity count diagnostic

---
 .../src/entity_count_diagnostics_plugin.rs    | 31 +++++++++++++++++++
 crates/bevy_diagnostic/src/lib.rs             |  2 ++
 examples/diagnostics/log_diagnostics.rs       |  2 ++
 3 files changed, 35 insertions(+)
 create mode 100644 crates/bevy_diagnostic/src/entity_count_diagnostics_plugin.rs

diff --git a/crates/bevy_diagnostic/src/entity_count_diagnostics_plugin.rs b/crates/bevy_diagnostic/src/entity_count_diagnostics_plugin.rs
new file mode 100644
index 0000000000000..5a41d0419d5f9
--- /dev/null
+++ b/crates/bevy_diagnostic/src/entity_count_diagnostics_plugin.rs
@@ -0,0 +1,31 @@
+use crate::{Diagnostic, DiagnosticId, Diagnostics};
+use bevy_app::prelude::*;
+use bevy_ecs::{Entity, IntoSystem, Query, ResMut};
+
+/// Adds "entity count" diagnostic to an App
+#[derive(Default)]
+pub struct EntityCountDiagnosticsPlugin;
+
+impl Plugin for EntityCountDiagnosticsPlugin {
+    fn build(&self, app: &mut AppBuilder) {
+        app.add_startup_system(Self::setup_system.system())
+            .add_system(Self::diagnostic_system.system());
+    }
+}
+
+impl EntityCountDiagnosticsPlugin {
+    pub const ENTITY_COUNT: DiagnosticId =
+        DiagnosticId::from_u128(187513512115068938494459732780662867798);
+
+    pub fn setup_system(mut diagnostics: ResMut<Diagnostics>) {
+        diagnostics.add(Diagnostic::new(Self::ENTITY_COUNT, "entity_count", 20));
+    }
+
+    pub fn diagnostic_system(mut diagnostics: ResMut<Diagnostics>, query: Query<Entity>) {
+        let mut count = 0.;
+        for _entity in &mut query.iter() {
+            count += 1.;
+        }
+        diagnostics.add_measurement(Self::ENTITY_COUNT, count);
+    }
+}
diff --git a/crates/bevy_diagnostic/src/lib.rs b/crates/bevy_diagnostic/src/lib.rs
index 44620b9193156..dfb6b6d324e4f 100644
--- a/crates/bevy_diagnostic/src/lib.rs
+++ b/crates/bevy_diagnostic/src/lib.rs
@@ -1,7 +1,9 @@
 mod diagnostic;
+mod entity_count_diagnostics_plugin;
 mod frame_time_diagnostics_plugin;
 mod log_diagnostics_plugin;
 pub use diagnostic::*;
+pub use entity_count_diagnostics_plugin::EntityCountDiagnosticsPlugin;
 pub use frame_time_diagnostics_plugin::FrameTimeDiagnosticsPlugin;
 pub use log_diagnostics_plugin::LogDiagnosticsPlugin;
 
diff --git a/examples/diagnostics/log_diagnostics.rs b/examples/diagnostics/log_diagnostics.rs
index 5ee84e11f8cf7..2a9dca9e94643 100644
--- a/examples/diagnostics/log_diagnostics.rs
+++ b/examples/diagnostics/log_diagnostics.rs
@@ -13,5 +13,7 @@ fn main() {
         // Any plugin can register diagnostics
         // Uncomment this to add some render resource diagnostics:
         // .add_plugin(bevy::wgpu::diagnostic::WgpuResourceDiagnosticsPlugin::default())
+        // Uncomment this to add an entity count diagnostics:
+        // .add_plugin(bevy::diagnostic::EntityCountDiagnosticsPlugin::default())
         .run();
 }

From 57332ccc8f6710cc73e447fcfb3b92e27193838c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Mockers?= <mockersf@gmail.com>
Date: Fri, 18 Dec 2020 02:30:25 +0100
Subject: [PATCH 3/7] asset count diagnostic

---
 crates/bevy_asset/Cargo.toml                  |  1 +
 .../asset_count_diagnostics_plugin.rs         | 35 +++++++++++++++++++
 crates/bevy_asset/src/diagnostic/mod.rs       |  2 ++
 crates/bevy_asset/src/lib.rs                  |  1 +
 examples/diagnostics/log_diagnostics.rs       |  2 ++
 5 files changed, 41 insertions(+)
 create mode 100644 crates/bevy_asset/src/diagnostic/asset_count_diagnostics_plugin.rs
 create mode 100644 crates/bevy_asset/src/diagnostic/mod.rs

diff --git a/crates/bevy_asset/Cargo.toml b/crates/bevy_asset/Cargo.toml
index e5644853e567b..1b8a01e6a3bf6 100644
--- a/crates/bevy_asset/Cargo.toml
+++ b/crates/bevy_asset/Cargo.toml
@@ -19,6 +19,7 @@ filesystem_watcher = ["notify"]
 [dependencies]
 # bevy
 bevy_app = { path = "../bevy_app", version = "0.4.0" }
+bevy_diagnostic = { path = "../bevy_diagnostic", version = "0.4.0" }
 bevy_ecs = { path = "../bevy_ecs", version = "0.4.0" }
 bevy_reflect = { path = "../bevy_reflect", version = "0.4.0", features = ["bevy"] }
 bevy_tasks = { path = "../bevy_tasks", version = "0.4.0" }
diff --git a/crates/bevy_asset/src/diagnostic/asset_count_diagnostics_plugin.rs b/crates/bevy_asset/src/diagnostic/asset_count_diagnostics_plugin.rs
new file mode 100644
index 0000000000000..db3d773d5004d
--- /dev/null
+++ b/crates/bevy_asset/src/diagnostic/asset_count_diagnostics_plugin.rs
@@ -0,0 +1,35 @@
+use crate::{Asset, Assets};
+use bevy_app::prelude::*;
+use bevy_diagnostic::{Diagnostic, DiagnosticId, Diagnostics};
+use bevy_ecs::{IntoSystem, Res, ResMut};
+
+/// Adds "asset count" diagnostic to an App
+#[derive(Default)]
+pub struct AssetCountDiagnosticsPlugin<T: Asset> {
+    marker: std::marker::PhantomData<T>,
+}
+
+impl<T: Asset> Plugin for AssetCountDiagnosticsPlugin<T> {
+    fn build(&self, app: &mut AppBuilder) {
+        app.add_startup_system(Self::setup_system.system())
+            .add_system(Self::diagnostic_system.system());
+    }
+}
+
+impl<T: Asset> AssetCountDiagnosticsPlugin<T> {
+    pub fn diagnostic_id() -> DiagnosticId {
+        DiagnosticId(T::TYPE_UUID)
+    }
+
+    pub fn setup_system(mut diagnostics: ResMut<Diagnostics>) {
+        diagnostics.add(Diagnostic::new(
+            Self::diagnostic_id(),
+            &format!("asset_count {}", std::any::type_name::<T>()),
+            20,
+        ));
+    }
+
+    pub fn diagnostic_system(mut diagnostics: ResMut<Diagnostics>, assets: Res<Assets<T>>) {
+        diagnostics.add_measurement(Self::diagnostic_id(), assets.len() as f64);
+    }
+}
diff --git a/crates/bevy_asset/src/diagnostic/mod.rs b/crates/bevy_asset/src/diagnostic/mod.rs
new file mode 100644
index 0000000000000..f093527f9755a
--- /dev/null
+++ b/crates/bevy_asset/src/diagnostic/mod.rs
@@ -0,0 +1,2 @@
+mod asset_count_diagnostics_plugin;
+pub use asset_count_diagnostics_plugin::AssetCountDiagnosticsPlugin;
diff --git a/crates/bevy_asset/src/lib.rs b/crates/bevy_asset/src/lib.rs
index 5c9b4133b9d81..e65ce22bd0c39 100644
--- a/crates/bevy_asset/src/lib.rs
+++ b/crates/bevy_asset/src/lib.rs
@@ -1,5 +1,6 @@
 mod asset_server;
 mod assets;
+pub mod diagnostic;
 #[cfg(all(
     feature = "filesystem_watcher",
     all(not(target_arch = "wasm32"), not(target_os = "android"))
diff --git a/examples/diagnostics/log_diagnostics.rs b/examples/diagnostics/log_diagnostics.rs
index 2a9dca9e94643..a48efde05623f 100644
--- a/examples/diagnostics/log_diagnostics.rs
+++ b/examples/diagnostics/log_diagnostics.rs
@@ -15,5 +15,7 @@ fn main() {
         // .add_plugin(bevy::wgpu::diagnostic::WgpuResourceDiagnosticsPlugin::default())
         // Uncomment this to add an entity count diagnostics:
         // .add_plugin(bevy::diagnostic::EntityCountDiagnosticsPlugin::default())
+        // Uncomment this to add an asset count diagnostics:
+        // .add_plugin(bevy::asset::diagnostic::AssetCountDiagnosticsPlugin::<Texture>::default())
         .run();
 }

From 011183789266ddf14a6668225c08267ff621258d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Mockers?= <mockersf@gmail.com>
Date: Tue, 22 Dec 2020 14:16:35 +0100
Subject: [PATCH 4/7] remove useless `pub`s

---
 crates/bevy_diagnostic/src/log_diagnostics_plugin.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/crates/bevy_diagnostic/src/log_diagnostics_plugin.rs b/crates/bevy_diagnostic/src/log_diagnostics_plugin.rs
index dd4aeeea02344..6e5d2636d7670 100644
--- a/crates/bevy_diagnostic/src/log_diagnostics_plugin.rs
+++ b/crates/bevy_diagnostic/src/log_diagnostics_plugin.rs
@@ -13,7 +13,7 @@ pub struct LogDiagnosticsPlugin {
 }
 
 /// State used by the [LogDiagnosticsPlugin]
-pub struct LogDiagnosticsState {
+struct LogDiagnosticsState {
     timer: Timer,
     filter: Option<Vec<DiagnosticId>>,
 }
@@ -67,7 +67,7 @@ impl LogDiagnosticsPlugin {
         }
     }
 
-    pub fn log_diagnostics_system(
+    fn log_diagnostics_system(
         mut state: ResMut<LogDiagnosticsState>,
         time: Res<Time>,
         diagnostics: Res<Diagnostics>,
@@ -85,7 +85,7 @@ impl LogDiagnosticsPlugin {
         }
     }
 
-    pub fn log_diagnostics_debug_system(
+    fn log_diagnostics_debug_system(
         mut state: ResMut<LogDiagnosticsState>,
         time: Res<Time>,
         diagnostics: Res<Diagnostics>,

From 3c4c3cf4a300631f1ea64c9db5c38cd41e9aaf2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Mockers?= <mockersf@gmail.com>
Date: Tue, 22 Dec 2020 14:35:14 +0100
Subject: [PATCH 5/7] use `BTreeMap` instead of `HashMap`

---
 crates/bevy_diagnostic/src/diagnostic.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/crates/bevy_diagnostic/src/diagnostic.rs b/crates/bevy_diagnostic/src/diagnostic.rs
index 20d7edcf93e3e..47c3fcdb3b5c9 100644
--- a/crates/bevy_diagnostic/src/diagnostic.rs
+++ b/crates/bevy_diagnostic/src/diagnostic.rs
@@ -1,8 +1,8 @@
-use bevy_utils::{Duration, HashMap, Instant, Uuid};
-use std::collections::VecDeque;
+use bevy_utils::{Duration, Instant, Uuid};
+use std::collections::{BTreeMap, VecDeque};
 
 /// Unique identifier for a [Diagnostic]
-#[derive(Debug, Copy, Clone, Hash, Eq, PartialEq)]
+#[derive(Debug, Copy, Clone, Hash, Eq, PartialEq, PartialOrd, Ord)]
 pub struct DiagnosticId(pub Uuid);
 
 impl DiagnosticId {
@@ -101,7 +101,7 @@ impl Diagnostic {
 /// A collection of [Diagnostic]s
 #[derive(Debug, Default)]
 pub struct Diagnostics {
-    diagnostics: HashMap<DiagnosticId, Diagnostic>,
+    diagnostics: BTreeMap<DiagnosticId, Diagnostic>,
 }
 
 impl Diagnostics {

From d3fefc2c058a1ebcb27a9e6f0e795f04522e5084 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Mockers?= <mockersf@gmail.com>
Date: Thu, 24 Dec 2020 01:21:35 +0100
Subject: [PATCH 6/7] get entity count from world

---
 .../src/entity_count_diagnostics_plugin.rs            | 10 ++++------
 crates/bevy_ecs/src/core/entities.rs                  | 11 +++++++++++
 crates/bevy_ecs/src/core/world.rs                     |  6 ++++++
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/crates/bevy_diagnostic/src/entity_count_diagnostics_plugin.rs b/crates/bevy_diagnostic/src/entity_count_diagnostics_plugin.rs
index 5a41d0419d5f9..36a709f453795 100644
--- a/crates/bevy_diagnostic/src/entity_count_diagnostics_plugin.rs
+++ b/crates/bevy_diagnostic/src/entity_count_diagnostics_plugin.rs
@@ -1,6 +1,6 @@
 use crate::{Diagnostic, DiagnosticId, Diagnostics};
 use bevy_app::prelude::*;
-use bevy_ecs::{Entity, IntoSystem, Query, ResMut};
+use bevy_ecs::{IntoSystem, ResMut, Resources, World};
 
 /// Adds "entity count" diagnostic to an App
 #[derive(Default)]
@@ -21,11 +21,9 @@ impl EntityCountDiagnosticsPlugin {
         diagnostics.add(Diagnostic::new(Self::ENTITY_COUNT, "entity_count", 20));
     }
 
-    pub fn diagnostic_system(mut diagnostics: ResMut<Diagnostics>, query: Query<Entity>) {
-        let mut count = 0.;
-        for _entity in &mut query.iter() {
-            count += 1.;
+    pub fn diagnostic_system(world: &mut World, resources: &mut Resources) {
+        if let Some(mut diagnostics) = resources.get_mut::<Diagnostics>() {
+            diagnostics.add_measurement(Self::ENTITY_COUNT, world.entity_count() as f64);
         }
-        diagnostics.add_measurement(Self::ENTITY_COUNT, count);
     }
 }
diff --git a/crates/bevy_ecs/src/core/entities.rs b/crates/bevy_ecs/src/core/entities.rs
index 146856f4ea4fb..f7d001cae7c40 100644
--- a/crates/bevy_ecs/src/core/entities.rs
+++ b/crates/bevy_ecs/src/core/entities.rs
@@ -252,9 +252,20 @@ impl Entities {
         }
     }
 
+    /// Number of freed entities in `self.meta`
+    pub fn freed_len(&self) -> u32 {
+        self.free_cursor.load(Ordering::Relaxed)
+    }
+
+    /// Number of reserved entities outside of `self.meta`
+    pub fn pending_len(&self) -> u32 {
+        self.pending.load(Ordering::Relaxed)
+    }
+
     // The following three methods allow iteration over `reserved` simultaneous to location
     // writes. This is a lazy hack, but we only use it in `World::flush` so the complexity and unsafety
     // involved in producing an `impl Iterator<Item=(u32, &mut Location)>` isn't a clear win.
+    /// Number of reserved entities in `self.meta`
     pub fn reserved_len(&self) -> u32 {
         self.reserved_cursor.load(Ordering::Relaxed)
     }
diff --git a/crates/bevy_ecs/src/core/world.rs b/crates/bevy_ecs/src/core/world.rs
index ca0c2938f0976..b7adb54a978a1 100644
--- a/crates/bevy_ecs/src/core/world.rs
+++ b/crates/bevy_ecs/src/core/world.rs
@@ -500,6 +500,12 @@ impl World {
         })
     }
 
+    pub fn entity_count(&self) -> u32 {
+        self.entities.meta.len() as u32 - self.entities.freed_len()
+            + self.entities.reserved_len()
+            + self.entities.pending_len()
+    }
+
     /// Borrow the `T` component of `entity` without checking if it can be mutated
     ///
     /// # Safety

From c69f3a9e6ff91d3058081a7af083e7521fa89fa7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Mockers?= <mockersf@gmail.com>
Date: Thu, 24 Dec 2020 02:40:05 +0100
Subject: [PATCH 7/7] keep ordered list of diagnostics

---
 crates/bevy_diagnostic/src/diagnostic.rs           | 14 +++++++++++---
 .../bevy_diagnostic/src/log_diagnostics_plugin.rs  |  4 ++--
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/crates/bevy_diagnostic/src/diagnostic.rs b/crates/bevy_diagnostic/src/diagnostic.rs
index 47c3fcdb3b5c9..549ecdb20f755 100644
--- a/crates/bevy_diagnostic/src/diagnostic.rs
+++ b/crates/bevy_diagnostic/src/diagnostic.rs
@@ -1,5 +1,5 @@
-use bevy_utils::{Duration, Instant, Uuid};
-use std::collections::{BTreeMap, VecDeque};
+use bevy_utils::{Duration, HashMap, Instant, Uuid};
+use std::collections::{BTreeSet, VecDeque};
 
 /// Unique identifier for a [Diagnostic]
 #[derive(Debug, Copy, Clone, Hash, Eq, PartialEq, PartialOrd, Ord)]
@@ -101,11 +101,13 @@ impl Diagnostic {
 /// A collection of [Diagnostic]s
 #[derive(Debug, Default)]
 pub struct Diagnostics {
-    diagnostics: BTreeMap<DiagnosticId, Diagnostic>,
+    diagnostics: HashMap<DiagnosticId, Diagnostic>,
+    ordered_diagnostics: BTreeSet<DiagnosticId>,
 }
 
 impl Diagnostics {
     pub fn add(&mut self, diagnostic: Diagnostic) {
+        self.ordered_diagnostics.insert(diagnostic.id);
         self.diagnostics.insert(diagnostic.id, diagnostic);
     }
 
@@ -132,4 +134,10 @@ impl Diagnostics {
     pub fn iter(&self) -> impl Iterator<Item = &Diagnostic> {
         self.diagnostics.values()
     }
+
+    pub fn ordered_iter(&self) -> impl Iterator<Item = &Diagnostic> {
+        self.ordered_diagnostics
+            .iter()
+            .filter_map(move |k| self.diagnostics.get(k))
+    }
 }
diff --git a/crates/bevy_diagnostic/src/log_diagnostics_plugin.rs b/crates/bevy_diagnostic/src/log_diagnostics_plugin.rs
index 6e5d2636d7670..276480786f611 100644
--- a/crates/bevy_diagnostic/src/log_diagnostics_plugin.rs
+++ b/crates/bevy_diagnostic/src/log_diagnostics_plugin.rs
@@ -78,7 +78,7 @@ impl LogDiagnosticsPlugin {
                     Self::log_diagnostic(diagnostic);
                 }
             } else {
-                for diagnostic in diagnostics.iter() {
+                for diagnostic in diagnostics.ordered_iter() {
                     Self::log_diagnostic(diagnostic);
                 }
             }
@@ -96,7 +96,7 @@ impl LogDiagnosticsPlugin {
                     debug!("{:#?}\n", diagnostic);
                 }
             } else {
-                for diagnostic in diagnostics.iter() {
+                for diagnostic in diagnostics.ordered_iter() {
                     debug!("{:#?}\n", diagnostic);
                 }
             }