Skip to content

Commit

Permalink
Bump tracy-client to 0.17 to expose delayed-init feature (#1462)
Browse files Browse the repository at this point in the history
This bumps the tracy-client crate to 0.17, so that we can access the
`delayed-init` feature (it's not present in 0.16.4 but necessary to use
with core). Previously we were patching this dep entirely with a local
vendored build of tracy in core, so this potentially moves us closer to
upstream (if it work).
  • Loading branch information
graydon authored Sep 17, 2024
1 parent f9a5197 commit b901825
Show file tree
Hide file tree
Showing 5 changed files with 147 additions and 40 deletions.
177 changes: 142 additions & 35 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion soroban-bench-utils/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ rust-version.workspace = true
publish = false

[target.'cfg(not(target_family = "wasm"))'.dependencies]
tracy-client = { version = "=0.16.4", features = ["enable", "timer-fallback"], default-features = false, optional = true }
tracy-client = { version = "=0.17.0", features = ["enable", "timer-fallback"], default-features = false, optional = true }

[target.'cfg(target_os = "linux")'.dependencies]
perf-event = "0.4.7"
Expand Down
2 changes: 1 addition & 1 deletion soroban-env-common/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ num-traits = {version = "0.2.17", default-features = false}
num-derive = "0.4.1"

[target.'cfg(not(target_family = "wasm"))'.dependencies]
tracy-client = { version = "0.16.4", features = ["enable", "timer-fallback"], default-features = false, optional = true }
tracy-client = { version = "0.17.0", features = ["enable", "timer-fallback"], default-features = false, optional = true }

[dev-dependencies]
num_enum = "0.7.1"
Expand Down
2 changes: 1 addition & 1 deletion soroban-env-host/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ sha3 = "0.10.8"
curve25519-dalek = { version = ">=4.1.1", default-features = false, features = ["digest"]}

[target.'cfg(not(target_family = "wasm"))'.dependencies]
tracy-client = { version = "0.16.4", features = ["enable", "timer-fallback"], default-features = false, optional = true }
tracy-client = { version = "0.17.0", features = ["enable", "timer-fallback"], default-features = false, optional = true }

[dev-dependencies]
hex = "0.4.3"
Expand Down
4 changes: 2 additions & 2 deletions soroban-env-host/src/host/crypto.rs
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ pub(crate) fn chacha20_fill_bytes(
dest: &mut [u8],
budget: impl AsBudget,
) -> Result<(), HostError> {
tracy_span!("chacha20");
let _span = tracy_span!("chacha20");
budget
.as_budget()
.charge(ContractCostType::ChaCha20DrawBytes, Some(dest.len() as u64))?;
Expand All @@ -353,7 +353,7 @@ pub(crate) fn unbias_prng_seed(
seed: &[u8; SEED_BYTES as usize],
budget: impl AsBudget,
) -> Result<[u8; SEED_BYTES as usize], HostError> {
tracy_span!("unbias_prng_seed");
let _span = tracy_span!("unbias_prng_seed");

// Salt is fixed and must not be changed; it is effectively "part of the
// protocol" and must be the same for all implementations.
Expand Down

0 comments on commit b901825

Please sign in to comment.