From 01aadace80108e32322ea64a7ca355a1cb04d3d9 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 14 Jun 2024 14:17:37 +0300 Subject: feat(tvix/cli,store): add tracy feature If compiled with this features, this emits packets compatible with the [Tracy](https://github.com/wolfpld/tracy) format. Change-Id: I330f5d85ab290abe51f2df38dc55464f3ccfc6cd Reviewed-on: https://cl.tvl.fyi/c/depot/+/11815 Tested-by: BuildkiteCI Reviewed-by: Connor Brewster --- tvix/Cargo.nix | 8 ++++++-- tvix/cli/Cargo.toml | 4 ++++ tvix/store/Cargo.toml | 1 + 3 files changed, 11 insertions(+), 2 deletions(-) (limited to 'tvix') diff --git a/tvix/Cargo.nix b/tvix/Cargo.nix index f854a7cf0ea2..3b8c45bf48f4 100644 --- a/tvix/Cargo.nix +++ b/tvix/Cargo.nix @@ -13546,7 +13546,10 @@ rec { packageId = "wu-manber"; } ]; - + features = { + "tracy" = [ "tvix-tracing/tracy" ]; + }; + resolvedDefaultFeatures = [ "default" "tracy" ]; }; "tvix-eval" = rec { crateName = "tvix-eval"; @@ -14175,9 +14178,10 @@ rec { "fuse" = [ "tvix-castore/fuse" ]; "otlp" = [ "tvix-tracing/otlp" ]; "tonic-reflection" = [ "dep:tonic-reflection" "tvix-castore/tonic-reflection" ]; + "tracy" = [ "tvix-tracing/tracy" ]; "virtiofs" = [ "tvix-castore/virtiofs" ]; }; - resolvedDefaultFeatures = [ "cloud" "default" "fuse" "integration" "otlp" "tonic-reflection" "virtiofs" ]; + resolvedDefaultFeatures = [ "cloud" "default" "fuse" "integration" "otlp" "tonic-reflection" "tracy" "virtiofs" ]; }; "tvix-tracing" = rec { crateName = "tvix-tracing"; diff --git a/tvix/cli/Cargo.toml b/tvix/cli/Cargo.toml index 434e4045e90f..644393a7c4ed 100644 --- a/tvix/cli/Cargo.toml +++ b/tvix/cli/Cargo.toml @@ -30,3 +30,7 @@ git = "https://github.com/tvlfyi/wu-manber.git" [target.'cfg(not(target_env = "msvc"))'.dependencies] tikv-jemallocator = "0.5" + +[features] +default = [] +tracy = ["tvix-tracing/tracy"] diff --git a/tvix/store/Cargo.toml b/tvix/store/Cargo.toml index dc6126724fe6..760569eb8dc6 100644 --- a/tvix/store/Cargo.toml +++ b/tvix/store/Cargo.toml @@ -71,6 +71,7 @@ cloud = [ fuse = ["tvix-castore/fuse"] otlp = ["tvix-tracing/otlp"] tonic-reflection = ["dep:tonic-reflection", "tvix-castore/tonic-reflection"] +tracy = ["tvix-tracing/tracy"] virtiofs = ["tvix-castore/virtiofs"] # Whether to run the integration tests. # Requires the following packages in $PATH: -- cgit 1.4.1