archive-gh-me/maplibre-rs
1
0
Fork 0
mirror of https://github.com/maplibre/maplibre-rs.git synced 2025-12-08 19:05:57 +00:00
Code Issues Projects Releases Wiki Activity

Fixes #138 - upgraded tracy-client to 0.14.* and tracing-tracy to 0.10.* (#156)

Browse Source 
* Fixes #138 - upgraded tracy-client to 0.14.* and tracing-tracy to 0.10.* as per README

* Convert set_thread_name to a macro (set_thread_name!), to permit non-web tracing.

* Updated docs to briefly explain the connection to tracy and the appropriate crate versions.

Co-authored-by: Max Ammann <max@maxammann.org>
This commit is contained in:
karisair 2022-09-08 17:17:22 +01:00 committed by GitHub
parent 7783493f09
commit a8f704a31a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
docs/src/development-guide/debugging.md
View File

@ -11,4 +11,24 @@
## Frame Profiling
* tracing crate
maplibre-rs is set up to use the Tracy profiler (https://github.com/wolfpld/tracy). It's mainly designed for C++ but has some Rust support.
The connection to Rust uses a project that connects to the tracing crate (https://github.com/nagisa/rust_tracy_client). This uses a set of three crates (tracing-tracy, tracy-client, tracy-client-sys).
Unfortunately, the Tracy project does not use semantic versioning, whereas tracing-tracy, tracy-client, tracy-client sys do.
The current version of the Rust client is at v0.8.1 of Tracy. See the correlating versions in the table below (original at https://github.com/nagisa/rust_tracy_client#version-support-table):
| Tracy | tracy-client-sys | tracy-client | tracing-tracy |
| ----- | ---------------- | ------------ | ------------- |
| 0.7.1 | 0.9.0 | 0.8.0 | 0.2.0 |
| 0.7.3 | 0.10.0 | 0.9.0 | 0.3.0 |
| 0.7.4 | 0.11.0 | 0.10.0 | 0.4.0 |
| 0.7.5 | 0.12.0 | 0.11.0 | 0.5.0 |
| 0.7.6 | 0.13.0, 0.14.0 | 0.12.* | 0.6.* |
| v0.7.7 | 0.15.0 | 0.12.* | 0.6.* |
| v0.7.8 | 0.16.0 | 0.12.* | 0.6.* |
| v0.7.8 | 0.16.0 | 0.12.* | 0.7.* |
| v0.7.8 | 0.16.0 | 0.12.* | 0.8.* |
| v0.8.1 | 0.17.* | 0.13.* | 0.9.* |
| v0.8.1 | 0.17.* | 0.14.* | 0.10.* |

7
maplibre-demo/Cargo.toml
View File

@ -21,7 +21,8 @@ tile-grid = "0.3"
tracing = "0.1.35"
tracing-subscriber = { version = "0.3.14", optional = true }
tracing-tracy = { version = "0.8", optional = true }
tracy-client = { version = "0.12.7", optional = true }
clap = { version = "3.2.12", features = ["derive"] }
tracing-tracy = { version = "0.10", optional = true }
tracy-client = { version = "0.14", optional = true }
clap = { version = "3.2.12", features = ["derive"] }

8
maplibre/Cargo.toml
View File

@ -21,10 +21,10 @@ headless = ["png"]
tokio = { version = "1.20.1", features = ["macros", "rt", "rt-multi-thread", "sync", "time"] }
env_logger = "0.9.0"
reqwest = { version = "0.11.11", default-features = false, features = ["rustls-tls", "gzip"] }
reqwest-middleware-cache = "0.1.1"
reqwest-middleware = "0.1.6"
tracing-tracy = { version = "0.10.0", optional = true }
tracy-client = { version = "0.14.0", optional = true }
reqwest-middleware-cache = "0.1.1" # FIXME: Untrusted dependency
reqwest-middleware = "0.1.6" # FIXME: Untrusted dependency
tracing-tracy = { version = "0.10", optional = true }
tracy-client = { version = "0.14", optional = true }
[target.'cfg(target_os = "android")'.dependencies]
# Use rusttls on android because cross compiling is difficult