Merge of #6354

sigp · Sep 6, 2024 · 39c9827 · 39c9827
2 parents c824142 + 4ca3108
commit 39c9827
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 41 deletions.
diff --git a/.cargo/config.toml b/.cargo/config.toml
@@ -1,4 +1,3 @@
 [env]
 # Set the number of arenas to 16 when using jemalloc.
 JEMALLOC_SYS_WITH_MALLOC_CONF = "abort_conf:true,narenas:16"
-
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/common/malloc_utils/Cargo.toml b/common/malloc_utils/Cargo.toml
@@ -8,16 +8,19 @@ edition = { workspace = true }
 lighthouse_metrics = { workspace = true }
 libc = "0.2.79"
 parking_lot = { workspace = true }
-jemalloc-ctl = { version = "0.5.0", optional = true }
+tikv-jemalloc-ctl = { version = "0.6.0", optional = true, features = ["stats"] }
 
 # Jemalloc's background_threads feature requires Linux (pthreads).
 [target.'cfg(target_os = "linux")'.dependencies]
-jemallocator = { version = "0.5.0", optional = true, features = ["stats", "background_threads"] }
+tikv-jemallocator = { version = "0.6.0", optional = true, features = [
+    "stats",
+    "background_threads",
+] }
 
 [target.'cfg(not(target_os = "linux"))'.dependencies]
-jemallocator = { version = "0.5.0", optional = true, features = ["stats"] }
+tikv-jemallocator = { version = "0.6.0", optional = true, features = ["stats"] }
 
 [features]
 mallinfo2 = []
-jemalloc = ["jemallocator", "jemalloc-ctl"]
-jemalloc-profiling = ["jemallocator/profiling"]
+jemalloc = ["tikv-jemallocator", "tikv-jemalloc-ctl"]
+jemalloc-profiling = ["tikv-jemallocator/profiling"]
diff --git a/common/malloc_utils/src/jemalloc.rs b/common/malloc_utils/src/jemalloc.rs
@@ -7,12 +7,12 @@
 //!
 //! A) `JEMALLOC_SYS_WITH_MALLOC_CONF` at compile-time.
 //! B) `_RJEM_MALLOC_CONF` at runtime.
-use jemalloc_ctl::{arenas, epoch, stats, Error};
 use lighthouse_metrics::{set_gauge, try_create_int_gauge, IntGauge};
 use std::sync::LazyLock;
+use tikv_jemalloc_ctl::{arenas, epoch, stats, Error};
 
 #[global_allocator]
-static ALLOC: jemallocator::Jemalloc = jemallocator::Jemalloc;
+static ALLOC: tikv_jemallocator::Jemalloc = tikv_jemallocator::Jemalloc;
 
 // Metrics for jemalloc.
 pub static NUM_ARENAS: LazyLock<lighthouse_metrics::Result<IntGauge>> =