feat: optimization

src/core/node_collections.rs

@@ -7,33 +7,32 @@ use std::{
 	sync::{Arc, Weak},
 };
 
-#[derive(Default)]
-pub struct LifeLinkedNodeList {
-	nodes: Mutex<Vec<Weak<Node>>>,
-}
-impl LifeLinkedNodeList {
-	pub fn add(&self, node: Weak<Node>) {
-		self.nodes.lock().push(node);
-	}
+// #[derive(Default)]
+// pub struct LifeLinkedNodeList {
+// 	nodes: Mutex<Vec<Weak<Node>>>,
+// }
+// impl LifeLinkedNodeList {
+// 	pub fn add(&self, node: Weak<Node>) {
+// 		self.nodes.lock().push(node);
+// 	}
+// 	pub fn clear(&self) {
+// 		self.nodes
+// 			.lock()
+// 			.iter()
+// 			.filter_map(|node| node.upgrade())
+// 			.for_each(|node| {
+// 				node.destroy();
+// 			});
+// 		self.nodes.lock().clear();
+// 	}
+// }
+// impl Drop for LifeLinkedNodeList {
+// 	fn drop(&mut self) {
+// 		self.clear();
+// 	}
+// }
 
-	pub fn clear(&self) {
-		self.nodes
-			.lock()
-			.iter()
-			.filter_map(|node| node.upgrade())
-			.for_each(|node| {
-				node.destroy();
-			});
-		self.nodes.lock().clear();
-	}
-}
-impl Drop for LifeLinkedNodeList {
-	fn drop(&mut self) {
-		self.clear();
-	}
-}
-
-#[derive(Default)]
+#[derive(Default, Debug)]
 pub struct LifeLinkedNodeMap<K: Hash + Eq> {
 	nodes: Mutex<FxHashMap<K, Weak<Node>>>,
 }

src/core/scenegraph.rs

@@ -3,13 +3,14 @@ use crate::{core::client::Client, nodes::Message};
 use color_eyre::eyre::Result;
 use once_cell::sync::OnceCell;
 use parking_lot::Mutex;
+use portable_atomic::Ordering;
 use rustc_hash::FxHashMap;
 use stardust_xr::scenegraph;
 use stardust_xr::scenegraph::ScenegraphError;
 use std::os::fd::OwnedFd;
 use std::sync::{Arc, Weak};
 use tokio::sync::oneshot;
-use tracing::{debug, debug_span, instrument};
+use tracing::{debug, debug_span};
 
 #[derive(Default)]
 pub struct Scenegraph {
@@ -33,11 +34,14 @@ impl Scenegraph {
 		self.nodes.lock().insert(path, node);
 	}
 
-	#[instrument(level = "debug", skip(self))]
 	pub fn get_node(&self, path: &str) -> Option<Arc<Node>> {
 		let mut node = self.nodes.lock().get(path)?.clone();
 		while let Some(alias) = node.alias.get() {
-			node = alias.original.upgrade()?;
+			if alias.enabled.load(Ordering::Relaxed) {
+				node = alias.original.upgrade()?;
+			} else {
+				return None;
+			}
 		}
 		Some(node)
 	}

src/core/task.rs

@@ -1,10 +1,8 @@
 use color_eyre::eyre::Result;
 use std::future::Future;
 use tokio::task::JoinHandle;
-use tracing::instrument;
 
 #[allow(unused_variables)]
-#[instrument(level = "debug", skip_all)]
 pub fn new<
 	F: FnOnce() -> S,
 	S: AsRef<str>,