mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-07-20 18:35:41 +00:00
Fix polkadot-node-core-pvf-prepare-worker build with jemalloc (#1315)
* Fix polkadot-node-core-pvf-prepare-worker build with jemalloc The jemalloc feature on polkadot-node-core-pvf-prepare-worker depended on some feature gated code in polkadot-node-core-pvf-common but there way no way to enable this feature gate. This commit adds the feature and makes prepare-worker enable it. * More jemalloc-allocator fixes * Fix jemalloc-allocator feature dep * Run `zepter format features` --------- Co-authored-by: Marcin S <marcin@realemail.net>
This commit is contained in:
Generated
-1
@@ -12183,7 +12183,6 @@ dependencies = [
|
|||||||
"sp-core",
|
"sp-core",
|
||||||
"sp-maybe-compressed-blob",
|
"sp-maybe-compressed-blob",
|
||||||
"sp-tracing",
|
"sp-tracing",
|
||||||
"tikv-jemalloc-ctl",
|
|
||||||
"tokio",
|
"tokio",
|
||||||
"tracing-gum",
|
"tracing-gum",
|
||||||
]
|
]
|
||||||
|
|||||||
+6
-1
@@ -22,7 +22,7 @@ version = "1.0.0"
|
|||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
color-eyre = { version = "0.6.1", default-features = false }
|
color-eyre = { version = "0.6.1", default-features = false }
|
||||||
tikv-jemallocator = "0.5.0"
|
tikv-jemallocator = { version = "0.5.0", optional = true }
|
||||||
|
|
||||||
# Crates in our workspace, defined as dependencies so we can pass them feature flags.
|
# Crates in our workspace, defined as dependencies so we can pass them feature flags.
|
||||||
polkadot-cli = { path = "cli", features = [
|
polkadot-cli = { path = "cli", features = [
|
||||||
@@ -38,6 +38,9 @@ polkadot-overseer = { path = "node/overseer" }
|
|||||||
polkadot-node-core-pvf-common = { path = "node/core/pvf/common" }
|
polkadot-node-core-pvf-common = { path = "node/core/pvf/common" }
|
||||||
polkadot-node-core-pvf-execute-worker = { path = "node/core/pvf/execute-worker" }
|
polkadot-node-core-pvf-execute-worker = { path = "node/core/pvf/execute-worker" }
|
||||||
|
|
||||||
|
[target.'cfg(target_os = "linux")'.dependencies]
|
||||||
|
tikv-jemallocator = "0.5.0"
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
assert_cmd = "2.0.4"
|
assert_cmd = "2.0.4"
|
||||||
nix = { version = "0.26.1", features = ["signal"] }
|
nix = { version = "0.26.1", features = ["signal"] }
|
||||||
@@ -59,7 +62,9 @@ fast-runtime = [ "polkadot-cli/fast-runtime" ]
|
|||||||
runtime-metrics = [ "polkadot-cli/runtime-metrics" ]
|
runtime-metrics = [ "polkadot-cli/runtime-metrics" ]
|
||||||
pyroscope = [ "polkadot-cli/pyroscope" ]
|
pyroscope = [ "polkadot-cli/pyroscope" ]
|
||||||
jemalloc-allocator = [
|
jemalloc-allocator = [
|
||||||
|
"dep:tikv-jemallocator",
|
||||||
"polkadot-node-core-pvf-prepare-worker/jemalloc-allocator",
|
"polkadot-node-core-pvf-prepare-worker/jemalloc-allocator",
|
||||||
|
"polkadot-node-core-pvf/jemalloc-allocator",
|
||||||
"polkadot-overseer/jemalloc-allocator",
|
"polkadot-overseer/jemalloc-allocator",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|||||||
@@ -54,6 +54,7 @@ halt = { package = "test-parachain-halt", path = "../../../parachain/test-parach
|
|||||||
|
|
||||||
[features]
|
[features]
|
||||||
ci-only-tests = []
|
ci-only-tests = []
|
||||||
|
jemalloc-allocator = [ "polkadot-node-core-pvf-common/jemalloc-allocator" ]
|
||||||
# This feature is used to export test code to other crates without putting it in the production build.
|
# This feature is used to export test code to other crates without putting it in the production build.
|
||||||
# This is also used by the `puppet_worker` binary.
|
# This is also used by the `puppet_worker` binary.
|
||||||
test-utils = [
|
test-utils = [
|
||||||
|
|||||||
@@ -38,3 +38,4 @@ tempfile = "3.3.0"
|
|||||||
# This feature is used to export test code to other crates without putting it in the production build.
|
# This feature is used to export test code to other crates without putting it in the production build.
|
||||||
# Also used for building the puppet worker.
|
# Also used for building the puppet worker.
|
||||||
test-utils = []
|
test-utils = []
|
||||||
|
jemalloc-allocator = []
|
||||||
|
|||||||
@@ -11,7 +11,6 @@ cpu-time = "1.0.0"
|
|||||||
futures = "0.3.21"
|
futures = "0.3.21"
|
||||||
gum = { package = "tracing-gum", path = "../../../gum" }
|
gum = { package = "tracing-gum", path = "../../../gum" }
|
||||||
rayon = "1.5.1"
|
rayon = "1.5.1"
|
||||||
tikv-jemalloc-ctl = { version = "0.5.0", optional = true }
|
|
||||||
tokio = { version = "1.24.2", features = ["fs", "process"] }
|
tokio = { version = "1.24.2", features = ["fs", "process"] }
|
||||||
|
|
||||||
parity-scale-codec = { version = "3.6.1", default-features = false, features = ["derive"] }
|
parity-scale-codec = { version = "3.6.1", default-features = false, features = ["derive"] }
|
||||||
@@ -24,8 +23,5 @@ sp-core = { path = "../../../../../substrate/primitives/core" }
|
|||||||
sp-maybe-compressed-blob = { path = "../../../../../substrate/primitives/maybe-compressed-blob" }
|
sp-maybe-compressed-blob = { path = "../../../../../substrate/primitives/maybe-compressed-blob" }
|
||||||
sp-tracing = { path = "../../../../../substrate/primitives/tracing" }
|
sp-tracing = { path = "../../../../../substrate/primitives/tracing" }
|
||||||
|
|
||||||
[target.'cfg(target_os = "linux")'.dependencies]
|
|
||||||
tikv-jemalloc-ctl = "0.5.0"
|
|
||||||
|
|
||||||
[features]
|
[features]
|
||||||
builder = []
|
builder = []
|
||||||
|
|||||||
@@ -32,4 +32,7 @@ tikv-jemalloc-ctl = "0.5.0"
|
|||||||
|
|
||||||
[features]
|
[features]
|
||||||
builder = []
|
builder = []
|
||||||
jemalloc-allocator = [ "dep:tikv-jemalloc-ctl" ]
|
jemalloc-allocator = [
|
||||||
|
"dep:tikv-jemalloc-ctl",
|
||||||
|
"polkadot-node-core-pvf-common/jemalloc-allocator",
|
||||||
|
]
|
||||||
|
|||||||
Reference in New Issue
Block a user