chore(deps): use tikv-jemallocator instead of jemallocator (#7232)

paradigmxyz · Mar 19, 2024 · 9d039a2 · 9d039a2
1 parent ce89a2b
commit 9d039a2
Show file tree

Hide file tree

Showing 10 changed files with 79 additions and 96 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -195,13 +195,8 @@ reth-trie = { path = "crates/trie" }
 reth-trie-parallel = { path = "crates/trie-parallel" }
 
 # revm
-revm = { version = "7.1.0", features = [
-    "std",
-    "secp256k1",
-], default-features = false }
-revm-primitives = { version = "3.0.0", features = [
-    "std",
-], default-features = false }
+revm = { version = "7.1.0", features = ["std", "secp256k1"], default-features = false }
+revm-primitives = { version = "3.0.0", features = ["std"], default-features = false }
 revm-inspectors = { git = "https://github.com/paradigmxyz/evm-inspectors", rev = "f96bc1f" }
 
 # eth
@@ -277,9 +272,9 @@ discv5 = "0.4"
 igd-next = "0.14.3"
 
 # rpc
-jsonrpsee = { version = "0.20" }
-jsonrpsee-core = { version = "0.20" }
-jsonrpsee-types = { version = "0.20" }
+jsonrpsee = "0.20"
+jsonrpsee-core = "0.20"
+jsonrpsee-types = "0.20"
 
 # crypto
 secp256k1 = { version = "0.27.0", default-features = false, features = [

diff --git a/bin/reth/Cargo.toml b/bin/reth/Cargo.toml
@@ -95,10 +95,8 @@ itertools.workspace = true
 rayon.workspace = true
 boyer-moore-magiclen = "0.2.16"
 
-[target.'cfg(not(windows))'.dependencies]
-jemallocator = { version = "0.5.0", optional = true }
-
 [target.'cfg(unix)'.dependencies]
+tikv-jemallocator = { version = "0.5.0", optional = true }
 libc = "0.2"
 
 [dev-dependencies]
@@ -110,8 +108,8 @@ default = ["jemalloc"]
 
 asm-keccak = ["reth-primitives/asm-keccak"]
 
-jemalloc = ["dep:jemallocator", "reth-node-core/jemalloc"]
-jemalloc-prof = ["jemalloc", "jemallocator?/profiling"]
+jemalloc = ["dep:tikv-jemallocator", "reth-node-core/jemalloc"]
+jemalloc-prof = ["jemalloc", "tikv-jemallocator?/profiling"]
 
 min-error-logs = ["tracing/release_max_level_error"]
 min-warn-logs = ["tracing/release_max_level_warn"]

diff --git a/bin/reth/src/lib.rs b/bin/reth/src/lib.rs
@@ -163,7 +163,7 @@ pub mod sigsegv_handler {
 }
 
 #[cfg(all(feature = "jemalloc", unix))]
-use jemallocator as _;
+use tikv_jemallocator as _;
 
 // for rendering diagrams
 use aquamarine as _;
diff --git a/bin/reth/src/main.rs b/bin/reth/src/main.rs
@@ -3,7 +3,7 @@
 // We use jemalloc for performance reasons.
 #[cfg(all(feature = "jemalloc", unix))]
 #[global_allocator]
-static ALLOC: jemallocator::Jemalloc = jemallocator::Jemalloc;
+static ALLOC: tikv_jemallocator::Jemalloc = tikv_jemallocator::Jemalloc;
 
 #[cfg(all(feature = "optimism", not(test)))]
 compile_error!("Cannot build the `reth` binary with the `optimism` feature flag enabled. Did you mean to build `op-reth`?");

diff --git a/bin/reth/src/optimism.rs b/bin/reth/src/optimism.rs
@@ -9,7 +9,7 @@ use reth_provider::BlockReaderIdExt;
 // We use jemalloc for performance reasons
 #[cfg(all(feature = "jemalloc", unix))]
 #[global_allocator]
-static ALLOC: jemallocator::Jemalloc = jemallocator::Jemalloc;
+static ALLOC: tikv_jemallocator::Jemalloc = tikv_jemallocator::Jemalloc;
 
 #[cfg(not(feature = "optimism"))]
 compile_error!("Cannot build the `op-reth` binary with the `optimism` feature flag disabled. Did you mean to build `reth`?");