Allow building Rojo with profile-with-tracy feature (#862)

This commit is contained in:
Micah
2024-02-20 14:56:55 -08:00
committed by GitHub
parent 02d79a4749
commit 42121a9fc9
3 changed files with 11 additions and 31 deletions

33
Cargo.lock generated
View File

@@ -1406,19 +1406,19 @@ dependencies = [
[[package]] [[package]]
name = "profiling" name = "profiling"
version = "1.0.11" version = "1.0.14"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f89dff0959d98c9758c88826cc002e2c3d0b9dfac4139711d1f30de442f1139b" checksum = "0f0f7f43585c34e4fdd7497d746bc32e14458cf11c69341cc0587b1d825dde42"
dependencies = [ dependencies = [
"profiling-procmacros", "profiling-procmacros",
"tracy-client 0.16.3", "tracy-client",
] ]
[[package]] [[package]]
name = "profiling-procmacros" name = "profiling-procmacros"
version = "1.0.11" version = "1.0.14"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eb156a45b6b9fe8027497422179fb65afc84d36707a7ca98297bf06bccb8d43f" checksum = "ce97fecd27bc49296e5e20518b5a1bb54a14f7d5fe6228bc9686ee2a74915cc8"
dependencies = [ dependencies = [
"quote 1.0.33", "quote 1.0.33",
"syn 2.0.37", "syn 2.0.37",
@@ -1800,7 +1800,6 @@ dependencies = [
"thiserror", "thiserror",
"tokio", "tokio",
"toml", "toml",
"tracy-client 0.13.2",
"uuid", "uuid",
"walkdir", "walkdir",
"winreg 0.10.1", "winreg 0.10.1",
@@ -2321,17 +2320,6 @@ dependencies = [
"tracing-log", "tracing-log",
] ]
[[package]]
name = "tracy-client"
version = "0.13.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "42ebfe7a24c18b5ba86d8920c124b41b942352f863fbe0c84d3d63428fa1860f"
dependencies = [
"loom",
"once_cell",
"tracy-client-sys 0.17.1",
]
[[package]] [[package]]
name = "tracy-client" name = "tracy-client"
version = "0.16.3" version = "0.16.3"
@@ -2340,16 +2328,7 @@ checksum = "03684af8fb393cc7903210d868e4cb9f5c1e156737be38f52c4217fb21b86bf6"
dependencies = [ dependencies = [
"loom", "loom",
"once_cell", "once_cell",
"tracy-client-sys 0.21.2", "tracy-client-sys",
]
[[package]]
name = "tracy-client-sys"
version = "0.17.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "178d021455e83078bb38c00b70046b95117ef0a0312cbef925f426d833d11c79"
dependencies = [
"cc",
] ]
[[package]] [[package]]

View File

@@ -26,7 +26,9 @@ default = []
# Enable this feature to live-reload assets from the web UI. # Enable this feature to live-reload assets from the web UI.
dev_live_assets = [] dev_live_assets = []
profile-with-tracy = ["profiling/profile-with-tracy", "tracy-client"] # Run Rojo with this feature to open a Tracy session.
# Currently uses protocol v63, last supported in Tracy 0.9.1.
profile-with-tracy = ["profiling/profile-with-tracy"]
[workspace] [workspace]
members = ["crates/*"] members = ["crates/*"]
@@ -87,8 +89,7 @@ thiserror = "1.0.30"
tokio = { version = "1.12.0", features = ["rt", "rt-multi-thread"] } tokio = { version = "1.12.0", features = ["rt", "rt-multi-thread"] }
uuid = { version = "1.0.0", features = ["v4", "serde"] } uuid = { version = "1.0.0", features = ["v4", "serde"] }
clap = { version = "3.1.18", features = ["derive"] } clap = { version = "3.1.18", features = ["derive"] }
profiling = "1.0.6" profiling = "1.0.14"
tracy-client = { version = "0.13.2", optional = true }
[target.'cfg(windows)'.dependencies] [target.'cfg(windows)'.dependencies]
winreg = "0.10.1" winreg = "0.10.1"

View File

@@ -7,7 +7,7 @@ use librojo::cli::Options;
fn main() { fn main() {
#[cfg(feature = "profile-with-tracy")] #[cfg(feature = "profile-with-tracy")]
tracy_client::Client::start(); profiling::tracy_client::Client::start();
panic::set_hook(Box::new(|panic_info| { panic::set_hook(Box::new(|panic_info| {
// PanicInfo's payload is usually a &'static str or String. // PanicInfo's payload is usually a &'static str or String.