Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update profiling and tracing-tracy crates

Browse Source
This commit is contained in:
Youser Nayme 2024-05-20 05:39:46 -04:00
parent 16cd184c47
commit 13bccaf888
No known key found for this signature in database
GPG Key ID: 08E3619383679CAE
4 changed files with 17 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Cargo.lock generated
View File

@ -2455,15 +2455,16 @@ dependencies = [
[[package]] [[package]]
name = "generator" name = "generator"
version = "0.7.5" version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5cc16584ff22b460a382b7feec54b23d2908d858152e5739a120b949293bd74e" checksum = "186014d53bc231d0090ef8d6f03e0920c54d85a5ed22f4f2f74315ec56cf83fb"
dependencies = [ dependencies = [
"cc", "cc",
"cfg-if 1.0.0",
"libc", "libc",
"log", "log",
"rustversion", "rustversion",
"windows 0.48.0", "windows 0.54.0",
] ]
[[package]] [[package]]
@ -3602,9 +3603,9 @@ checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
[[package]] [[package]]
name = "loom" name = "loom"
version = "0.5.6" version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5" checksum = "419e0dc8046cb947daa77eb95ae174acfbddb7673b4151f56d1eed8e93fbfaca"
dependencies = [ dependencies = [
"cfg-if 1.0.0", "cfg-if 1.0.0",
"generator", "generator",
@ -4815,9 +4816,9 @@ dependencies = [
[[package]] [[package]]
name = "profiling" name = "profiling"
version = "1.0.8" version = "1.0.15"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "332cd62e95873ea4f41f3dfd6bbbfc5b52aec892d7e8d534197c4720a0bbbab2" checksum = "43d84d1d7a6ac92673717f9f6d1518374ef257669c24ebc5ac25d5033828be58"
dependencies = [ dependencies = [
"profiling-procmacros", "profiling-procmacros",
"tracy-client", "tracy-client",
@ -6707,9 +6708,9 @@ dependencies = [
[[package]] [[package]]
name = "tracing-tracy" name = "tracing-tracy"
version = "0.10.2" version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "55c48ef3e655220d4e43a6be44aa84f078c3004357251cab45f9cc15551a593e" checksum = "6024d04f84a69fd0d1dc1eee3a2b070bd246530a0582f9982ae487cb6c703614"
dependencies = [ dependencies = [
"tracing-core", "tracing-core",
"tracing-subscriber", "tracing-subscriber",
@ -6718,9 +6719,9 @@ dependencies = [
[[package]] [[package]]
name = "tracy-client" name = "tracy-client"
version = "0.15.2" version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "434ecabbda9f67eeea1eab44d52f4a20538afa3e2c2770f2efc161142b25b608" checksum = "59fb931a64ff88984f86d3e9bcd1ae8843aa7fe44dd0f8097527bc172351741d"
dependencies = [ dependencies = [
"loom", "loom",
"once_cell", "once_cell",
@ -8443,15 +8444,6 @@ dependencies = [
"thiserror", "thiserror",
] ]
[[package]]
name = "windows"
version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
dependencies = [
"windows-targets 0.48.5",
]
[[package]] [[package]]
name = "windows" name = "windows"
version = "0.51.1" version = "0.51.1"

2
common/base/Cargo.toml
View File

@ -16,4 +16,4 @@ directories-next = "2.0"
# NOTE: This must be kept in sync with the `tracy-client` version used by the # NOTE: This must be kept in sync with the `tracy-client` version used by the
# `tracing-tracy` version in `common/frontend`. # `tracing-tracy` version in `common/frontend`.
# Using `=` here keeps `cargo update` from breaking this. # Using `=` here keeps `cargo update` from breaking this.
profiling = { version = "=1.0.8", default-features = false, optional = true } profiling = { version = "=1.0.15", default-features = false, optional = true }

2
common/frontend/Cargo.toml
View File

@ -20,4 +20,4 @@ tracing-subscriber = { version = "0.3.7", default-features = false, features = [
# Tracy # Tracy
# NOTE: This must be kept in sync with the `profiling` version in `common/base`. # NOTE: This must be kept in sync with the `profiling` version in `common/base`.
# NOTE: `=` since the minor version of tracing-tracy bumped a major version of `tracy-client` # NOTE: `=` since the minor version of tracing-tracy bumped a major version of `tracy-client`
tracing-tracy = { version = "=0.10.2", optional = true } tracing-tracy = { version = "=0.11.0", optional = true }

4
common/frontend/src/lib.rs
View File

@ -109,7 +109,9 @@ where
// Create the terminal writer layer. // Create the terminal writer layer.
#[cfg(feature = "tracy")] #[cfg(feature = "tracy")]
let registry = registry.with(tracing_tracy::TracyLayer::new().with_stackdepth(0)); let registry = registry.with(tracing_tracy::TracyLayer::new(
tracing_tracy::DefaultConfig::default(),
));
#[cfg(not(feature = "tracy"))] #[cfg(not(feature = "tracy"))]
let registry = { let registry = {
let (non_blocking, stdio_guard) = tracing_appender::non_blocking(terminal.make_writer()); let (non_blocking, stdio_guard) = tracing_appender::non_blocking(terminal.make_writer());