Skip to content

Commit cfc9719

Browse files
authored
Merge pull request #4520 from Xuanwo/fix-musl
build: Fix musl support
2 parents 3b21104 + 3bd4b0e commit cfc9719

File tree

3 files changed

+42
-14
lines changed

3 files changed

+42
-14
lines changed

Cargo.lock

Lines changed: 35 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

common/base/Cargo.toml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,15 @@ ctrlc = { version = "3.2.1", features = ["termination"] }
2626
futures = "0.3.21"
2727
hyper = "0.14.17"
2828
poem = { version = "1.3.6", features = ["rustls"] }
29-
pprof = { version = "0.6.2", features = ["flamegraph", "protobuf"] }
3029
serde = { version = "1.0.136", features = ["derive"] }
3130
serde_json = { version = "1.0.79", default-features = false, features = ["raw_value"] }
3231
serde_yaml = { version = "0.8.23", default-features = false }
32+
# Rollback to tagged release after 666d9e2 included in new release.
33+
pprof = { git = "https://github.com/tikv/pprof-rs", rev = "666d9e2", features = [
34+
"flamegraph",
35+
"protobuf-codec",
36+
"protobuf",
37+
] }
3338
tokio = { version = "1.17.0", features = ["full"] }
3439
toml = { version = "0.5.8", default-features = false }
3540
uuid = { version = "0.8.2", features = ["serde", "v4"] }

common/base/src/profiling.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ impl Profiling {
6060
.pprof()
6161
.map_err(|e| ErrorCode::UnknownException(e.to_string()))?;
6262
profile
63-
.encode(&mut body)
63+
.write_to_vec(&mut body)
6464
.map_err(|e| ErrorCode::UnknownException(e.to_string()))?;
6565

6666
Ok(body)

0 commit comments

Comments
 (0)