More instrumenting - stop enumerating devices on start

Author: manpat

toybox-audio/src/lib.rs

@@ -14,10 +14,13 @@ pub mod prelude {
 }
 
 
+#[instrument(skip_all, name="audio init")]
 pub fn init() -> anyhow::Result<System> {
 	let host = cpal::default_host();
 
-	if true {
+	if false {
+		let _span = tracing::info_span!("enumerate audio devices").entered();
+
 		log::trace!("vvvvvvv Available audio devices vvvvvvvv");
 
 		for device in host.output_devices()? {

toybox-cfg/Cargo.toml

@@ -10,4 +10,5 @@ edition.workspace = true
 dirs = "5.0.1"
 toml = "0.8.10"
 anyhow.workspace = true
+tracing.workspace = true
 log.workspace = true

toybox-cfg/src/lib.rs

@@ -5,6 +5,7 @@ pub mod table;
 use table::{Table, Value};
 
 use std::path::{PathBuf};
+use tracing::instrument;
 
 
 /// Runtime representation of hierarchical key-value storage, intended for settings, command line config, etc.
@@ -27,6 +28,7 @@ pub struct Config {
 }
 
 impl Config {
+	#[instrument(skip_all, name="cfg Config::for_app_name")]
 	pub fn for_app_name(app_name: &str) -> anyhow::Result<Self> {
 		let mut config = Self::default();
 
@@ -47,11 +49,13 @@ impl Config {
 		Ok(config)
 	}
 
+	#[instrument(skip_all, name="cfg Config::save")]
 	pub fn save(&self) -> anyhow::Result<()> {
 		// TODO(pat.m): extra resolve? 
 		self.base.save_to_file(&self.save_path)
 	}
 
+	#[instrument(skip_all, name="cfg Config::commit")]
 	pub fn commit(&mut self) {
 		self.base.merge_from(&self.preview);
 		self.arguments.remove_values_in(&self.preview);
@@ -61,6 +65,7 @@ impl Config {
 		self.resolved = Table::new();
 	}
 
+	#[instrument(skip_all, name="cfg Config::revert")]
 	pub fn revert(&mut self) {
 		self.preview = Table::new();
 		self.resolved = Table::new();
@@ -96,6 +101,7 @@ impl Config {
 }
 
 
+#[instrument]
 pub fn config_path(app_name: &str) -> PathBuf {
 	let mut dir = dirs::preference_dir() 
 		.expect("Couldn't get preferences dir");

toybox-egui/src/lib.rs

@@ -32,6 +32,7 @@ pub struct Integration {
 }
 
 impl Integration {
+	#[instrument(skip_all, name="egui Integration::new")]
 	pub fn new(ctx: egui::Context, window: Rc<Window>, gfx: &mut gfx::System) -> anyhow::Result<Integration> {
 		let theme = None;
 		let scale_factor = window.scale_factor() as f32;

toybox-egui/src/renderer.rs

@@ -24,6 +24,7 @@ pub struct Renderer {
 }
 
 impl Renderer {
+	#[tracing::instrument(skip_all, name="egui Renderer::new")]
 	pub fn new(gfx: &mut gfx::System) -> Renderer {
 		Renderer {
 			vertex_shader: gfx.resource_manager.request(CompileShaderRequest::vertex("egui vs", VERTEX_SOURCE)),

toybox-egui/src/textures.rs

@@ -29,6 +29,7 @@ struct ManagedImage {
 
 
 impl TextureManager {
+	#[tracing::instrument(skip_all, name="egui TextureManager::new")]
 	pub fn new(gfx: &mut gfx::System) -> TextureManager {
 		let sampler = gfx.core.create_sampler();
 		gfx.core.set_sampler_minify_filter(sampler, FilterMode::Linear, None);

toybox-gfx/src/core.rs

@@ -2,6 +2,7 @@ use crate::prelude::*;
 
 use toybox_host as host;
 use host::prelude::*;
+use tracing::instrument;
 
 pub mod capabilities;
 pub mod fbo;
@@ -55,6 +56,7 @@ pub struct Core {
 }
 
 impl Core {
+	#[instrument(skip_all, name="gfx Core::new")]
 	pub fn new(gl: gl::Gl) -> Core {
 		let capabilities = Capabilities::from(&gl);
 		let global_vao_name = Self::create_and_bind_global_vao(&gl);

toybox-gfx/src/lib.rs

@@ -48,6 +48,7 @@ impl System {
 }
 
 impl System {
+	#[instrument(skip_all, name="gfxsys System::new")]
 	pub fn new(mut core: core::Core) -> anyhow::Result<System> {
 		core.register_debug_hook();
 

toybox-host/src/lib.rs

@@ -263,6 +263,8 @@ impl BootstrapState {
 		}
 
 		// Try to create our window and a config that describes a context we can create
+		let _span = tracing::info_span!("host build display").entered();
+
 		let (maybe_window, gl_config) = DisplayBuilder::new()
 			.with_window_attributes(Some(self.window_attributes.clone()))
 			.with_preference(ApiPreference::PreferEgl)
@@ -277,13 +279,17 @@ impl BootstrapState {
 			})
 			.map_err(|e| anyhow::format_err!("Failed to find suitable surface config: {e}"))?;
 
+		_span.exit();
+
 		log::info!("Display built with config: {gl_config:?}");
 
 		let maybe_raw_window_handle = maybe_window
 			.as_ref()
 			.and_then(|window| window.window_handle().ok())
 			.map(|handle| handle.as_raw());
 
+		let _span = tracing::info_span!("host create opengl context").entered();
+
 		let gl_context_attributes = self.gl_context_attributes.build(maybe_raw_window_handle);
 		let gl_display = gl_config.display();
 
@@ -292,17 +298,23 @@ impl BootstrapState {
 			gl_display.create_context(&gl_config, &gl_context_attributes)?
 		};
 
+		_span.exit();
+
 		log::info!("Context created with {gl_context_attributes:?}");
 
 		// Create our window for real if not already
 		let window = match maybe_window {
 			Some(window) => window,
-			None => glutin_winit::finalize_window(event_loop, self.window_attributes.clone(), &gl_config)?,
+			None => {
+				let _span = tracing::info_span!("host finalize window").entered();
+				glutin_winit::finalize_window(event_loop, self.window_attributes.clone(), &gl_config)?
+			}
 		};
 
 		let window = Rc::new(window);
 
 		// Create a surface
+		let _span = tracing::info_span!("host build surface").entered();
 		let (width, height): (u32, u32) = window.inner_size().into();
 		let surface_attributes = glutin::surface::SurfaceAttributesBuilder::<WindowSurface>::new()
 			.with_srgb(Some(true))
@@ -316,13 +328,15 @@ impl BootstrapState {
 			gl_display.create_window_surface(&gl_config, &surface_attributes)?
 		};
 
+		_span.exit();
+
 		// Finally make our context current
 		let gl_context = non_current_gl_context.make_current(&gl_surface)?;
 
-		let gl = gl::Gl::load_with(|symbol| {
+		let gl = tracing::info_span!("host load opengl").in_scope(|| gl::Gl::load_with(|symbol| {
 			let symbol = std::ffi::CString::new(symbol).unwrap();
 			gl_display.get_proc_address(symbol.as_c_str()).cast()
-		});
+		}));
 
 		Ok(Host {
 			context: gl_context,

toybox-input/Cargo.toml

@@ -9,6 +9,7 @@ winit.workspace = true
 egui.workspace = true
 common.workspace = true
 log.workspace = true
+tracing.workspace = true
 
 
 gilrs = { version = "0.10.2", optional = true }