Use system libc jemalloc instead of tikv-jemallocator on FreeBSD (#2433)

On FreeBSD use system provided malloc (which is jemalloc) instead of the tikv-jemallocator crate.
anza-xyz · Nov 25, 2024 · eb2652b · eb2652b
1 parent f320175
commit eb2652b
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/ledger-tool/Cargo.toml b/ledger-tool/Cargo.toml
@@ -59,7 +59,7 @@ solana_rbpf = { workspace = true, features = ["debugger"] }
 thiserror = { workspace = true }
 tokio = { workspace = true, features = ["full"] }
 
-[target.'cfg(not(target_env = "msvc"))'.dependencies]
+[target.'cfg(not(any(target_env = "msvc", target_os = "freebsd")))'.dependencies]
 jemallocator = { workspace = true }
 
 [dev-dependencies]

diff --git a/ledger-tool/src/main.rs b/ledger-tool/src/main.rs
@@ -796,10 +796,10 @@ fn record_transactions(
     }
 }
 
-#[cfg(not(target_env = "msvc"))]
+#[cfg(not(any(target_env = "msvc", target_os = "freebsd")))]
 use jemallocator::Jemalloc;
 
-#[cfg(not(target_env = "msvc"))]
+#[cfg(not(any(target_env = "msvc", target_os = "freebsd")))]
 #[global_allocator]
 static GLOBAL: Jemalloc = Jemalloc;
 

diff --git a/validator/Cargo.toml b/validator/Cargo.toml
@@ -77,7 +77,7 @@ solana-runtime = { workspace = true, features = ["dev-context-only-utils"] }
 spl-token-2022 = { workspace = true, features = ["no-entrypoint"] }
 tempfile = { workspace = true }
 
-[target.'cfg(not(target_env = "msvc"))'.dependencies]
+[target.'cfg(not(any(target_env = "msvc", target_os = "freebsd")))'.dependencies]
 jemallocator = { workspace = true }
 
 [target."cfg(unix)".dependencies]

diff --git a/validator/src/main.rs b/validator/src/main.rs
@@ -1,5 +1,5 @@
 #![allow(clippy::arithmetic_side_effects)]
-#[cfg(not(target_env = "msvc"))]
+#[cfg(not(any(target_env = "msvc", target_os = "freebsd")))]
 use jemallocator::Jemalloc;
 use {
     agave_validator::{
@@ -87,7 +87,7 @@ use {
     },
 };
 
-#[cfg(not(target_env = "msvc"))]
+#[cfg(not(any(target_env = "msvc", target_os = "freebsd")))]
 #[global_allocator]
 static GLOBAL: Jemalloc = Jemalloc;