From c5cd236b7380c3689792934aeaecd2942713fa67 Mon Sep 17 00:00:00 2001
From: Bingus <shankern@protonmail.com>
Date: Tue, 29 Nov 2022 19:50:58 -0800
Subject: Initial profiling support for Iced.

---
 glutin/Cargo.toml         |  6 ++++++
 glutin/src/application.rs | 44 ++++++++++++++++++++++++++++++++------------
 2 files changed, 38 insertions(+), 12 deletions(-)

(limited to 'glutin')

diff --git a/glutin/Cargo.toml b/glutin/Cargo.toml
index 022457b1..6749cb96 100644
--- a/glutin/Cargo.toml
+++ b/glutin/Cargo.toml
@@ -11,6 +11,7 @@ keywords = ["gui", "ui", "graphics", "interface", "widgets"]
 categories = ["gui"]
 
 [features]
+trace = ["iced_profiling/tracing-chrome"]
 debug = ["iced_winit/debug"]
 system = ["iced_winit/system"]
 
@@ -35,3 +36,8 @@ features = ["application"]
 version = "0.5"
 path = "../graphics"
 features = ["opengl"]
+
+[dependencies.iced_profiling]
+version = "0.1.0"
+path = "../profiling"
+optional = true
diff --git a/glutin/src/application.rs b/glutin/src/application.rs
index 3e9d11f9..21051f16 100644
--- a/glutin/src/application.rs
+++ b/glutin/src/application.rs
@@ -17,6 +17,9 @@ use iced_winit::{Clipboard, Command, Debug, Proxy, Settings};
 use glutin::window::Window;
 use std::mem::ManuallyDrop;
 
+#[cfg(feature = "trace")]
+use iced_profiling::{info_span, instrument::Instrument};
+
 /// Runs an [`Application`] with an executor, compositor, and the provided
 /// settings.
 pub fn run<A, E, C>(
@@ -35,9 +38,15 @@ where
     use glutin::platform::run_return::EventLoopExtRunReturn;
     use glutin::ContextBuilder;
 
+    #[cfg(feature = "trace")]
+    let _guard = iced_profiling::init();
+
     let mut debug = Debug::new();
     debug.startup_started();
 
+    #[cfg(feature = "trace")]
+    let _ = info_span!("Application::Glutin", "RUN").entered();
+
     let mut event_loop = EventLoopBuilder::with_user_event().build();
     let proxy = event_loop.create_proxy();
 
@@ -124,18 +133,26 @@ where
 
     let (mut sender, receiver) = mpsc::unbounded();
 
-    let mut instance = Box::pin(run_instance::<A, E, C>(
-        application,
-        compositor,
-        renderer,
-        runtime,
-        proxy,
-        debug,
-        receiver,
-        context,
-        init_command,
-        settings.exit_on_close_request,
-    ));
+    let mut instance = Box::pin({
+        let run_instance = run_instance::<A, E, C>(
+            application,
+            compositor,
+            renderer,
+            runtime,
+            proxy,
+            debug,
+            receiver,
+            context,
+            init_command,
+            settings.exit_on_close_request,
+        );
+
+        #[cfg(feature = "trace")]
+        let run_instance =
+            run_instance.instrument(info_span!("Application", "LOOP"));
+
+        run_instance
+    });
 
     let mut context = task::Context::from_waker(task::noop_waker_ref());
 
@@ -333,6 +350,9 @@ async fn run_instance<A, E, C>(
                 messages.push(message);
             }
             event::Event::RedrawRequested(_) => {
+                #[cfg(feature = "trace")]
+                let _ = info_span!("Application", "FRAME").entered();
+
                 debug.render_started();
 
                 #[allow(unsafe_code)]
-- 
cgit 


From 4b6d3797d43acb1d78a292a7ec712a0be7c8f6a2 Mon Sep 17 00:00:00 2001
From: bungoboingo <shankern@protonmail.com>
Date: Tue, 20 Dec 2022 20:41:09 -0800
Subject: Restructured everything to make profiling a feature of iced_winit.

---
 glutin/Cargo.toml         |  9 ++++-----
 glutin/src/application.rs | 12 ++++++------
 2 files changed, 10 insertions(+), 11 deletions(-)

(limited to 'glutin')

diff --git a/glutin/Cargo.toml b/glutin/Cargo.toml
index 6749cb96..304170cd 100644
--- a/glutin/Cargo.toml
+++ b/glutin/Cargo.toml
@@ -11,7 +11,7 @@ keywords = ["gui", "ui", "graphics", "interface", "widgets"]
 categories = ["gui"]
 
 [features]
-trace = ["iced_profiling/tracing-chrome"]
+trace = ["iced_winit/trace"]
 debug = ["iced_winit/debug"]
 system = ["iced_winit/system"]
 
@@ -37,7 +37,6 @@ version = "0.5"
 path = "../graphics"
 features = ["opengl"]
 
-[dependencies.iced_profiling]
-version = "0.1.0"
-path = "../profiling"
-optional = true
+[dependencies.tracing]
+version = "0.1.6"
+optional = true
\ No newline at end of file
diff --git a/glutin/src/application.rs b/glutin/src/application.rs
index 21051f16..1464bb2d 100644
--- a/glutin/src/application.rs
+++ b/glutin/src/application.rs
@@ -17,8 +17,8 @@ use iced_winit::{Clipboard, Command, Debug, Proxy, Settings};
 use glutin::window::Window;
 use std::mem::ManuallyDrop;
 
-#[cfg(feature = "trace")]
-use iced_profiling::{info_span, instrument::Instrument};
+#[cfg(feature = "tracing")]
+use tracing::{info_span, instrument::Instrument};
 
 /// Runs an [`Application`] with an executor, compositor, and the provided
 /// settings.
@@ -39,12 +39,12 @@ where
     use glutin::ContextBuilder;
 
     #[cfg(feature = "trace")]
-    let _guard = iced_profiling::init();
+    let _guard = iced_winit::Profiler::init();
 
     let mut debug = Debug::new();
     debug.startup_started();
 
-    #[cfg(feature = "trace")]
+    #[cfg(feature = "tracing")]
     let _ = info_span!("Application::Glutin", "RUN").entered();
 
     let mut event_loop = EventLoopBuilder::with_user_event().build();
@@ -147,7 +147,7 @@ where
             settings.exit_on_close_request,
         );
 
-        #[cfg(feature = "trace")]
+        #[cfg(feature = "tracing")]
         let run_instance =
             run_instance.instrument(info_span!("Application", "LOOP"));
 
@@ -350,7 +350,7 @@ async fn run_instance<A, E, C>(
                 messages.push(message);
             }
             event::Event::RedrawRequested(_) => {
-                #[cfg(feature = "trace")]
+                #[cfg(feature = "tracing")]
                 let _ = info_span!("Application", "FRAME").entered();
 
                 debug.render_started();
-- 
cgit