No Tracy by default

uberFoo · Nov 24, 2023 · 1f96dab · 1f96dab
1 parent 631ebf9
commit 1f96dab
Show file tree

Hide file tree

Showing 324 changed files with 3,833 additions and 5,214 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -32,9 +32,8 @@ nut = { git = "https://github.com/uberFoo/nut" }
 parking_lot = { version = "0.12.1", features = [
     "serde",
     "hardware-lock-elision",
-    "deadlock_detection",
+    # "deadlock_detection",
 ] }
-pretty_env_logger = "0.4.0"
 rustc-hash = "1.1.0"
 serde = { version = "1.0.152", features = ["derive"] }
 snafu = "0.7.4"
@@ -50,6 +49,7 @@ crate-type = ["lib", "staticlib"]
 
 [dev-dependencies]
 env_logger = "0.10.0"
+pretty_env_logger = "0.5.0"
 
 [features]
 default = ["lu-dog-vec"]

diff --git a/models/lu_dog.json b/models/lu_dog.json
diff --git a/sarzak.toml b/sarzak.toml
@@ -1,11 +1,17 @@
+#
+# Lu Dog
+#
 [modules."v2/lu_dog"]
 model = "models/lu_dog.json"
+
 [[modules."v2/lu_dog".compiler]]
 always_process = true
 compiler = "grace"
 derive = ["Clone", "Debug", "Deserialize", "PartialEq", "Serialize"]
 imported_domains = ["crate/v2/sarzak"]
 use_paths = ["serde::{Deserialize, Serialize}"]
+tracy = false
+
 [modules."v2/lu_dog".compiler.target]
 optimization_level = "None"
 is_meta_model = true
@@ -15,14 +21,20 @@ persist_timestamps = false
 uber_store = "Single"
 target = "domain"
 
+#
+# Lu Dog Vec
+#
 [modules."v2/lu_dog_vec"]
 model = "models/lu_dog.json"
+
 [[modules."v2/lu_dog_vec".compiler]]
 always_process = true
 compiler = "grace"
 derive = ["Clone", "Debug", "Deserialize", "Serialize"]
 imported_domains = ["crate/v2/sarzak"]
 use_paths = ["serde::{Deserialize, Serialize}"]
+tracy = false
+
 [modules."v2/lu_dog_vec".compiler.target]
 optimization_level = "Vec"
 is_meta_model = true
@@ -32,14 +44,20 @@ persist_timestamps = false
 uber_store = "Single"
 target = "domain"
 
+#
+# Lu Dog RwLock Vec
+#
 [modules."v2/lu_dog_rwlock_vec"]
 model = "models/lu_dog.json"
+
 [[modules."v2/lu_dog_rwlock_vec".compiler]]
 always_process = true
 compiler = "grace"
 derive = ["Clone", "Debug", "Deserialize", "Serialize"]
 imported_domains = ["crate/v2/sarzak"]
 use_paths = ["serde::{Deserialize, Serialize}"]
+tracy = false
+
 [modules."v2/lu_dog_rwlock_vec".compiler.target]
 optimization_level = "Vec"
 is_meta_model = true
@@ -49,14 +67,20 @@ persist_timestamps = false
 uber_store = "StdRwLock"
 target = "domain"
 
+#
+# Lu Dog No Deadlocks RwLock Vec
+#
 [modules."v2/lu_dog_ndrwlock_vec"]
 model = "models/lu_dog.json"
+
 [[modules."v2/lu_dog_ndrwlock_vec".compiler]]
 always_process = true
 compiler = "grace"
 derive = ["Clone", "Debug", "Deserialize", "Serialize"]
 imported_domains = ["crate/v2/sarzak"]
 use_paths = ["serde::{Deserialize, Serialize}"]
+tracy = false
+
 [modules."v2/lu_dog_ndrwlock_vec".compiler.target]
 optimization_level = "Vec"
 is_meta_model = true
@@ -66,14 +90,20 @@ persist_timestamps = false
 uber_store = "NDRwLock"
 target = "domain"
 
+#
+# Lu Dog Async
+#
 [modules."v2/lu_dog_async"]
 model = "models/lu_dog.json"
+
 [[modules."v2/lu_dog_async".compiler]]
 always_process = true
 compiler = "grace"
 derive = ["Clone", "Debug", "Deserialize", "Serialize"]
 imported_domains = ["crate/v2/sarzak"]
 use_paths = ["serde::{Deserialize, Serialize}"]
+tracy = false
+
 [modules."v2/lu_dog_async".compiler.target]
 optimization_level = "Vec"
 is_meta_model = true
@@ -83,14 +113,20 @@ persist_timestamps = false
 uber_store = "AsyncRwLock"
 target = "domain"
 
+#
+# Lu Dog WTF?
+#
 [modules."v2/lu_dog_vanilla"]
 model = "models/lu_dog.json"
+
 [[modules."v2/lu_dog_vanilla".compiler]]
 always_process = true
 compiler = "grace"
 derive = ["Clone", "Debug", "Deserialize", "PartialEq", "Serialize"]
 imported_domains = ["crate/v2/sarzak"]
 use_paths = ["serde::{Deserialize, Serialize}"]
+tracy = false
+
 [modules."v2/lu_dog_vanilla".compiler.target]
 optimization_level = "None"
 is_meta_model = true
@@ -100,14 +136,20 @@ persist_timestamps = false
 uber_store = "Disabled"
 target = "domain"
 
+#
+# Lu Dog RwLock
+#
 [modules."v2/lu_dog_rwlock"]
 model = "models/lu_dog.json"
+
 [[modules."v2/lu_dog_rwlock".compiler]]
 always_process = true
 compiler = "grace"
 derive = ["Clone", "Debug", "Deserialize", "PartialEq", "Serialize"]
 imported_domains = ["crate/v2/sarzak"]
 use_paths = ["serde::{Deserialize, Serialize}"]
+tracy = false
+
 [modules."v2/lu_dog_rwlock".compiler.target]
 optimization_level = "None"
 is_meta_model = true
@@ -117,14 +159,20 @@ persist_timestamps = false
 uber_store = "StdRwLock"
 target = "domain"
 
+#
+# Lu Dog Parking Lot Mutex
+#
 [modules."v2/lu_dog_pl_mutex"]
 model = "models/lu_dog.json"
+
 [[modules."v2/lu_dog_pl_mutex".compiler]]
 always_process = true
 compiler = "grace"
 derive = ["Clone", "Debug", "Deserialize", "PartialEq", "Serialize"]
 imported_domains = ["crate/v2/sarzak"]
 use_paths = ["serde::{Deserialize, Serialize}"]
+tracy = false
+
 [modules."v2/lu_dog_pl_mutex".compiler.target]
 optimization_level = "None"
 is_meta_model = true
@@ -134,14 +182,20 @@ persist_timestamps = false
 uber_store = "ParkingLotMutex"
 target = "domain"
 
+#
+# Drawing
+#
 [modules."v2/drawing"]
 model = "models/drawing.json"
+
 [[modules."v2/drawing".compiler]]
 always_process = true
 compiler = "grace"
 derive = ["Clone", "Debug", "Deserialize", "PartialEq", "Serialize"]
 imported_domains = ["crate/v2/sarzak"]
 use_paths = ["serde::{Deserialize, Serialize}"]
+tracy = false
+
 [modules."v2/drawing".compiler.target]
 optimization_level = "None"
 from_module = "v1::drawing"
@@ -153,14 +207,20 @@ persist_timestamps = true
 uber_store = "StdRwLock"
 target = "domain"
 
+#
+# Merlin
+#
 [modules."v2/merlin"]
 model = "models/merlin.json"
+
 [[modules."v2/merlin".compiler]]
 always_process = true
 compiler = "grace"
 derive = ["Clone", "Debug", "Deserialize", "PartialEq", "Serialize"]
 imported_domains = ["crate/v2/sarzak"]
 use_paths = ["serde::{Deserialize, Serialize}"]
+tracy = false
+
 [modules."v2/merlin".compiler.target]
 optimization_level = "None"
 is_meta_model = true
@@ -170,13 +230,19 @@ persist_timestamps = false
 uber_store = "StdRwLock"
 target = "domain"
 
+#
+# Sarzak
+#
 [modules."v2/sarzak"]
 model = "models/sarzak.json"
+
 [[modules."v2/sarzak".compiler]]
 always_process = true
 compiler = "grace"
 derive = ["Clone", "Debug", "Deserialize", "PartialEq", "Serialize"]
 use_paths = ["serde::{Deserialize, Serialize}"]
+tracy = false
+
 [modules."v2/sarzak".compiler.target]
 optimization_level = "None"
 from_module = "v1::sarzak"
@@ -188,14 +254,20 @@ persist_timestamps = true
 uber_store = "StdRwLock"
 target = "domain"
 
+#
+# Woog
+#
 [modules."v2/woog"]
 model = "models/woog.json"
+
 [[modules."v2/woog".compiler]]
 always_process = true
 compiler = "grace"
 derive = ["Clone", "Debug", "Deserialize", "PartialEq", "Serialize"]
 imported_domains = ["crate/v2/sarzak"]
 use_paths = ["serde::{Deserialize, Serialize}"]
+tracy = false
+
 [modules."v2/woog".compiler.target]
 optimization_level = "None"
 is_meta_model = true

diff --git a/src/v2/drawing/types/anchor.rs b/src/v2/drawing/types/anchor.rs
@@ -2,7 +2,6 @@
 // {"magic":"","directive":{"Start":{"directive":"ignore-orig","tag":"anchor-use-statements"}}}
 use std::sync::Arc;
 use std::sync::RwLock;
-use tracy_client::span;
 use uuid::Uuid;
 
 use crate::v2::drawing::types::associative_ui::AssociativeUi;
@@ -68,7 +67,6 @@ impl Anchor {
     // {"magic":"","directive":{"Start":{"directive":"ignore-orig","tag":"anchor-struct-impl-nav-forward-to-edge"}}}
     /// Navigate to [`Edge`] across R3(1-*)
     pub fn r3_edge<'a>(&'a self, store: &'a DrawingStore) -> Vec<Arc<RwLock<Edge>>> {
-        span!("r3_edge");
         vec![store.exhume_edge(&self.edge).unwrap()]
     }
     // {"magic":"","directive":{"End":{"directive":"ignore-orig"}}}
@@ -77,14 +75,12 @@ impl Anchor {
     // {"magic":"","directive":{"Start":{"directive":"ignore-orig","tag":"anchor-struct-impl-nav-forward-to-location"}}}
     /// Navigate to [`Point`] across R4(1-*)
     pub fn r4_point<'a>(&'a self, store: &'a DrawingStore) -> Vec<Arc<RwLock<Point>>> {
-        span!("r4_point");
         vec![store.exhume_point(&self.location).unwrap()]
     }
     // {"magic":"","directive":{"End":{"directive":"ignore-orig"}}}
     // {"magic":"","directive":{"Start":{"directive":"ignore-orig","tag":"anchor-struct-impl-nav-forward-to-offset"}}}
     /// Navigate to [`Point`] across R5(1-*)
     pub fn r5_point<'a>(&'a self, store: &'a DrawingStore) -> Vec<Arc<RwLock<Point>>> {
-        span!("r5_point");
         vec![store.exhume_point(&self.offset).unwrap()]
     }
     // {"magic":"","directive":{"End":{"directive":"ignore-orig"}}}
@@ -94,7 +90,6 @@ impl Anchor {
         &'a self,
         store: &'a DrawingStore,
     ) -> Vec<Arc<RwLock<AssociativeUi>>> {
-        span!("r14_associative_ui");
         let associative_ui = store
             .iter_associative_ui()
             .find(|associative_ui| associative_ui.read().unwrap().one == self.id);
@@ -110,7 +105,6 @@ impl Anchor {
         &'a self,
         store: &'a DrawingStore,
     ) -> Vec<Arc<RwLock<AssociativeUi>>> {
-        span!("r15_associative_ui");
         let associative_ui = store
             .iter_associative_ui()
             .find(|associative_ui| associative_ui.read().unwrap().other == self.id);
@@ -126,7 +120,6 @@ impl Anchor {
         &'a self,
         store: &'a DrawingStore,
     ) -> Vec<Arc<RwLock<AssociativeUi>>> {
-        span!("r16_associative_ui");
         let associative_ui = store
             .iter_associative_ui()
             .find(|associative_ui| associative_ui.read().unwrap().middle == self.id);
@@ -139,7 +132,6 @@ impl Anchor {
     // {"magic":"","directive":{"Start":{"directive":"ignore-orig","tag":"anchor-struct-impl-nav-backward-cond-to-binary_ui"}}}
     /// Navigate to [`BinaryUi`] across R8(1-1c)
     pub fn r8c_binary_ui<'a>(&'a self, store: &'a DrawingStore) -> Vec<Arc<RwLock<BinaryUi>>> {
-        span!("r8_binary_ui");
         let binary_ui = store
             .iter_binary_ui()
             .find(|binary_ui| binary_ui.read().unwrap().to == self.id);
@@ -152,7 +144,6 @@ impl Anchor {
     // {"magic":"","directive":{"Start":{"directive":"ignore-orig","tag":"anchor-struct-impl-nav-backward-cond-to-binary_ui"}}}
     /// Navigate to [`BinaryUi`] across R7(1-1c)
     pub fn r7c_binary_ui<'a>(&'a self, store: &'a DrawingStore) -> Vec<Arc<RwLock<BinaryUi>>> {
-        span!("r7_binary_ui");
         let binary_ui = store
             .iter_binary_ui()
             .find(|binary_ui| binary_ui.read().unwrap().from == self.id);
@@ -165,7 +156,6 @@ impl Anchor {
     // {"magic":"","directive":{"Start":{"directive":"ignore-orig","tag":"anchor-struct-impl-nav-backward-cond-to-isa_ui"}}}
     /// Navigate to [`IsaUi`] across R9(1-1c)
     pub fn r9c_isa_ui<'a>(&'a self, store: &'a DrawingStore) -> Vec<Arc<RwLock<IsaUi>>> {
-        span!("r9_isa_ui");
         let isa_ui = store
             .iter_isa_ui()
             .find(|isa_ui| isa_ui.read().unwrap().from == self.id);
@@ -182,7 +172,6 @@ impl Anchor {
         &'a self,
         store: &'a DrawingStore,
     ) -> Vec<Arc<RwLock<SubtypeAnchors>>> {
-        span!("r10_subtype_anchors");
         store
             .iter_subtype_anchors()
             .filter(|subtype_anchors| subtype_anchors.read().unwrap().anchor_id == self.id)