From 1436f02093ba006bcba2b29a417582f3393c57c9 Mon Sep 17 00:00:00 2001 From: not-matthias Date: Mon, 1 Jun 2026 14:45:15 +0200 Subject: [PATCH 1/3] chore: bump framehop --- Cargo.lock | 14 +++++++------- Cargo.toml | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index cc325aa4..72cbd257 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -720,7 +720,7 @@ dependencies = [ "ipc-channel", "itertools 0.14.0", "libc", - "linux-perf-data 0.12.0", + "linux-perf-data 0.13.0 (git+https://github.com/AvalancheHQ/linux-perf-data.git?rev=effe486)", "log", "md5", "memmap2", @@ -2312,8 +2312,9 @@ checksum = "bfae20f6b19ad527b550c223fddc3077a547fc70cda94b9b566575423fd303ee" [[package]] name = "linux-perf-data" -version = "0.12.0" -source = "git+https://github.com/mstange/linux-perf-data.git?rev=da5bce4b9fb724e84b1eea0cb6ab9c8a291bc676#da5bce4b9fb724e84b1eea0cb6ab9c8a291bc676" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79544deaf2626fe2d10e5f87af7b7fca93c0d0062fc6ec84fc24e463039c6750" dependencies = [ "byteorder", "linear-map", @@ -2328,8 +2329,7 @@ dependencies = [ [[package]] name = "linux-perf-data" version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79544deaf2626fe2d10e5f87af7b7fca93c0d0062fc6ec84fc24e463039c6750" +source = "git+https://github.com/AvalancheHQ/linux-perf-data.git?rev=effe486#effe486d4a951d6655007a163b837e7c4a15848c" dependencies = [ "byteorder", "linear-map", @@ -4099,7 +4099,7 @@ dependencies = [ "indexmap", "lazy_static", "libc", - "linux-perf-data 0.13.0", + "linux-perf-data 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", "log", "mach2", "memchr", @@ -4206,7 +4206,7 @@ dependencies = [ "elsa", "flate2", "gimli", - "linux-perf-data 0.13.0", + "linux-perf-data 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", "lzma-rs", "macho-unwind-info", "memchr", diff --git a/Cargo.toml b/Cargo.toml index d4838669..ece2e1d3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -46,9 +46,9 @@ async-trait = "0.1.89" libc = { workspace = true } bincode = "1.3.3" # Pinned to 1.x: 2.0 changes the wire format and serde integration object = "0.39" -linux-perf-data = { git = "https://github.com/mstange/linux-perf-data.git", rev = "da5bce4b9fb724e84b1eea0cb6ab9c8a291bc676", features = [ +linux-perf-data = { git = "https://github.com/AvalancheHQ/linux-perf-data.git", rev = "effe486", features = [ "zstd", -] } # unreleased main as of 2026-03-19 +] } # unreleased branch as of 2026-06-01 debugid = "0.8.0" memmap2 = "0.9.10" nix = { version = "0.31.3", features = ["fs", "time", "user"] } From d887b4324b230297bc9c6cbd1c914cf07d90f3f9 Mon Sep 17 00:00:00 2001 From: not-matthias Date: Mon, 1 Jun 2026 14:49:19 +0200 Subject: [PATCH 2/3] Revert "fix(walltime): disable PYTHON_PERF_JIT_SUPPORT on macOS" This reverts commit f94e5b365871746b38b71063dcaba2dd8bb2b1dc. --- src/executor/helpers/env.rs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/executor/helpers/env.rs b/src/executor/helpers/env.rs index 219ef7cb..9fa659bc 100644 --- a/src/executor/helpers/env.rs +++ b/src/executor/helpers/env.rs @@ -24,9 +24,7 @@ pub fn get_base_injected_env( ("PYTHONHASHSEED".into(), "0".into()), ( "PYTHON_PERF_JIT_SUPPORT".into(), - // FIXME(COD-2645): Keep this disabled on macOS. Enabling it causes - // many unresolved addresses on the stack when profiling with samply. - if mode == RunnerMode::Walltime && !cfg!(target_os = "macos") { + if mode == RunnerMode::Walltime { "1".into() } else { "0".into() From 938d05e273520cf925358a2eb90f92ada0b1612b Mon Sep 17 00:00:00 2001 From: not-matthias Date: Mon, 1 Jun 2026 16:23:50 +0200 Subject: [PATCH 3/3] chore: use samply with latest linux-perf-data --- Cargo.lock | 19 +++++++++---------- Cargo.toml | 2 +- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 72cbd257..fb6b36ae 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1402,7 +1402,7 @@ dependencies = [ [[package]] name = "fxprof-processed-profile" version = "0.8.1" -source = "git+https://github.com/CodSpeedHQ/samply-codspeed?rev=e8b8dacc042978953a6db9616c72846f7b8d5062#e8b8dacc042978953a6db9616c72846f7b8d5062" +source = "git+https://github.com/CodSpeedHQ/samply-codspeed?rev=75ae209d#75ae209d1f22272e046be816f785509ba3e0a163" dependencies = [ "bitflags 2.11.1", "debugid", @@ -2323,7 +2323,6 @@ dependencies = [ "prost", "prost-derive", "thiserror 2.0.18", - "zstd-safe", ] [[package]] @@ -4077,7 +4076,7 @@ dependencies = [ [[package]] name = "samply" version = "0.13.1" -source = "git+https://github.com/CodSpeedHQ/samply-codspeed?rev=e8b8dacc042978953a6db9616c72846f7b8d5062#e8b8dacc042978953a6db9616c72846f7b8d5062" +source = "git+https://github.com/CodSpeedHQ/samply-codspeed?rev=75ae209d#75ae209d1f22272e046be816f785509ba3e0a163" dependencies = [ "bitflags 2.11.1", "byteorder", @@ -4099,7 +4098,7 @@ dependencies = [ "indexmap", "lazy_static", "libc", - "linux-perf-data 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", + "linux-perf-data 0.13.0 (git+https://github.com/AvalancheHQ/linux-perf-data.git?rev=effe486)", "log", "mach2", "memchr", @@ -4146,7 +4145,7 @@ dependencies = [ [[package]] name = "samply-api" version = "0.24.0" -source = "git+https://github.com/CodSpeedHQ/samply-codspeed?rev=e8b8dacc042978953a6db9616c72846f7b8d5062#e8b8dacc042978953a6db9616c72846f7b8d5062" +source = "git+https://github.com/CodSpeedHQ/samply-codspeed?rev=75ae209d#75ae209d1f22272e046be816f785509ba3e0a163" dependencies = [ "samply-debugid", "samply-symbols", @@ -4162,7 +4161,7 @@ dependencies = [ [[package]] name = "samply-debugid" version = "0.1.0" -source = "git+https://github.com/CodSpeedHQ/samply-codspeed?rev=e8b8dacc042978953a6db9616c72846f7b8d5062#e8b8dacc042978953a6db9616c72846f7b8d5062" +source = "git+https://github.com/CodSpeedHQ/samply-codspeed?rev=75ae209d#75ae209d1f22272e046be816f785509ba3e0a163" dependencies = [ "debugid", "uuid", @@ -4171,7 +4170,7 @@ dependencies = [ [[package]] name = "samply-object" version = "0.1.0" -source = "git+https://github.com/CodSpeedHQ/samply-codspeed?rev=e8b8dacc042978953a6db9616c72846f7b8d5062#e8b8dacc042978953a6db9616c72846f7b8d5062" +source = "git+https://github.com/CodSpeedHQ/samply-codspeed?rev=75ae209d#75ae209d1f22272e046be816f785509ba3e0a163" dependencies = [ "debugid", "object", @@ -4182,7 +4181,7 @@ dependencies = [ [[package]] name = "samply-quota-manager" version = "0.1.0" -source = "git+https://github.com/CodSpeedHQ/samply-codspeed?rev=e8b8dacc042978953a6db9616c72846f7b8d5062#e8b8dacc042978953a6db9616c72846f7b8d5062" +source = "git+https://github.com/CodSpeedHQ/samply-codspeed?rev=75ae209d#75ae209d1f22272e046be816f785509ba3e0a163" dependencies = [ "bytesize", "futures", @@ -4196,7 +4195,7 @@ dependencies = [ [[package]] name = "samply-symbols" version = "0.24.1" -source = "git+https://github.com/CodSpeedHQ/samply-codspeed?rev=e8b8dacc042978953a6db9616c72846f7b8d5062#e8b8dacc042978953a6db9616c72846f7b8d5062" +source = "git+https://github.com/CodSpeedHQ/samply-codspeed?rev=75ae209d#75ae209d1f22272e046be816f785509ba3e0a163" dependencies = [ "addr2line", "bitflags 2.11.1", @@ -5627,7 +5626,7 @@ dependencies = [ [[package]] name = "wholesym" version = "0.8.1" -source = "git+https://github.com/CodSpeedHQ/samply-codspeed?rev=e8b8dacc042978953a6db9616c72846f7b8d5062#e8b8dacc042978953a6db9616c72846f7b8d5062" +source = "git+https://github.com/CodSpeedHQ/samply-codspeed?rev=75ae209d#75ae209d1f22272e046be816f785509ba3e0a163" dependencies = [ "bytes", "core-foundation 0.10.1", diff --git a/Cargo.toml b/Cargo.toml index ece2e1d3..47fe26de 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -69,7 +69,7 @@ rmp-serde = "1.3.1" uuid = { version = "1.23.1", features = ["v4"] } which = "8.0.2" crc32fast = "1.5.0" -samply = { git = "https://github.com/CodSpeedHQ/samply-codspeed", rev = "e8b8dacc042978953a6db9616c72846f7b8d5062" } +samply = { git = "https://github.com/CodSpeedHQ/samply-codspeed", rev = "75ae209d" } [target.'cfg(target_os = "linux")'.dependencies] procfs = "0.18"