fix(build): restore mimalloc workspace dependency

rustfs/Cargo.toml

@@ -56,9 +56,6 @@ rio-v2 = ["rustfs-ecstore/rio-v2"]
 pyroscope = ["rustfs-obs/pyroscope"]
 # Tokio runtime telemetry. Requires `--cfg tokio_unstable`; use `make build-profiling`.
 dial9 = ["rustfs-obs/dial9"]
-# Allocator features
-mimalloc = ["dep:rustfs-mimalloc"]
-jemalloc = ["dep:tikv-jemallocator"]
 hotpath = [
     "hotpath/hotpath",
     "hotpath/tokio",
@@ -339,13 +336,13 @@ opentelemetry = { workspace = true }
 tracing-opentelemetry = { workspace = true }
 # Data structures
 hashbrown = { workspace = true, features = ["serde", "rayon"] }
-rustfs-mimalloc = { workspace = true, optional = true }
+rustfs-mimalloc = { workspace = true }
 
 [target.'cfg(target_os = "linux")'.dependencies]
 libsystemd.workspace = true
 
 [target.'cfg(not(target_os = "windows"))'.dependencies]
-tikv-jemallocator = { version = "0.6", optional = true }
+rustfs-mimalloc-sys = { workspace = true }
 
 [dev-dependencies]
 uuid = { workspace = true, features = ["v4", "v5", "fast-rng", "macro-diagnostics"] }
@@ -354,7 +351,7 @@ tempfile = { workspace = true }
 aws-config = { workspace = true }
 anyhow = { workspace = true }
 insta = { workspace = true, features = ["yaml", "json"] }
-proptest = "1"
+proptest = { workspace = true }
 tokio = { workspace = true, features = ["test-util", "fs", "rt-multi-thread"] }
 temp-env = { workspace = true, features = ["async_closure"] }
 tracing-subscriber = { workspace = true, features = ["env-filter", "time"] }

rustfs/src/allocator_reclaim.rs

@@ -169,25 +169,15 @@ impl AllocatorReclaimController {
 
 /// Return the allocator backend name used by reclaim and memory metrics.
 pub fn allocator_backend() -> &'static str {
-    #[cfg(all(feature = "mimalloc", not(target_os = "windows")))]
+    #[cfg(not(target_os = "windows"))]
     {
         "mimalloc"
     }
 
-    #[cfg(all(feature = "mimalloc", target_os = "windows"))]
+    #[cfg(target_os = "windows")]
     {
         "mimalloc-windows"
     }
-
-    #[cfg(all(not(feature = "mimalloc"), feature = "jemalloc"))]
-    {
-        "jemalloc"
-    }
-
-    #[cfg(not(any(feature = "mimalloc", feature = "jemalloc")))]
-    {
-        "system"
-    }
 }
 
 fn active_requests() -> u64 {
@@ -378,13 +368,13 @@ pub fn allocator_reclaim_controller_snapshot(ctx: &CancellationToken) -> Allocat
     )
 }
 
-#[cfg(all(feature = "mimalloc", not(target_os = "windows")))]
+#[cfg(not(target_os = "windows"))]
 fn collect_allocator_memory(force: bool) -> Result<(), String> {
     rustfs_mimalloc::MiMalloc::collect(force);
     Ok(())
 }
 
-#[cfg(not(all(feature = "mimalloc", not(target_os = "windows"))))]
+#[cfg(target_os = "windows")]
 fn collect_allocator_memory(_force: bool) -> Result<(), String> {
     Err("allocator reclaim requires mimalloc on a non-Windows target".to_string())
 }

rustfs/src/lib.rs

@@ -52,11 +52,6 @@
 //! tests where you start one server in a background task, run all your
 //! tests, and then shut it down.
 
-#[cfg(all(feature = "mimalloc", feature = "jemalloc"))]
-compile_error!("allocator features 'mimalloc' and 'jemalloc' are mutually exclusive");
-#[cfg(all(feature = "jemalloc", target_os = "windows"))]
-compile_error!("allocator feature 'jemalloc' is not supported on Windows");
-
 /// Scope-based hotpath measurement for `#[async_trait]` methods, where
 /// `#[hotpath::measure]` would only time the boxed-future construction.
 /// The guard records wall time from this statement until the enclosing

rustfs/src/main.rs

@@ -12,29 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#[cfg(all(
-    feature = "hotpath",
-    feature = "hotpath-alloc",
-    feature = "mimalloc",
-    not(feature = "jemalloc")
-))]
+#[cfg(all(feature = "hotpath", feature = "hotpath-alloc", not(target_os = "windows")))]
 use std::alloc::{GlobalAlloc, Layout};
 
-#[cfg(all(
-    feature = "hotpath",
-    feature = "hotpath-alloc",
-    feature = "mimalloc",
-    not(feature = "jemalloc")
-))]
+#[cfg(all(feature = "hotpath", feature = "hotpath-alloc", not(target_os = "windows")))]
 #[derive(Default)]
 struct MiMallocAllocator;
 
-#[cfg(all(
-    feature = "hotpath",
-    feature = "hotpath-alloc",
-    feature = "mimalloc",
-    not(feature = "jemalloc")
-))]
+#[cfg(all(feature = "hotpath", feature = "hotpath-alloc", not(target_os = "windows")))]
 // SAFETY: allocation operations are forwarded unchanged to MiMalloc, so
 // MiMalloc's GlobalAlloc guarantees apply to every returned pointer and layout.
 #[allow(unsafe_code)]
@@ -60,65 +45,25 @@ unsafe impl GlobalAlloc for MiMallocAllocator {
     }
 }
 
-#[cfg(all(
-    feature = "hotpath",
-    feature = "hotpath-alloc",
-    feature = "mimalloc",
-    not(feature = "jemalloc")
-))]
+#[cfg(all(feature = "hotpath", feature = "hotpath-alloc", not(target_os = "windows")))]
 #[global_allocator]
 static GLOBAL: hotpath::CountingAllocator<MiMallocAllocator> = hotpath::CountingAllocator::with(MiMallocAllocator);
 
-#[cfg(all(
-    feature = "hotpath",
-    feature = "hotpath-alloc",
-    feature = "jemalloc",
-    not(feature = "mimalloc"),
-    not(target_os = "windows")
-))]
-#[global_allocator]
-static GLOBAL: hotpath::CountingAllocator<tikv_jemallocator::Jemalloc> =
-    hotpath::CountingAllocator::with(tikv_jemallocator::Jemalloc);
-
-#[cfg(all(
-    feature = "hotpath",
-    feature = "hotpath-alloc",
-    not(any(feature = "mimalloc", feature = "jemalloc"))
-))]
+#[cfg(all(feature = "hotpath", feature = "hotpath-alloc", target_os = "windows"))]
 #[global_allocator]
 static GLOBAL: hotpath::CountingAllocator<std::alloc::System> = hotpath::CountingAllocator::with(std::alloc::System);
 
-#[cfg(all(
-    not(all(feature = "hotpath", feature = "hotpath-alloc")),
-    feature = "mimalloc",
-    not(feature = "jemalloc")
-))]
+#[cfg(all(not(all(feature = "hotpath", feature = "hotpath-alloc")), not(target_os = "windows")))]
 #[global_allocator]
 static GLOBAL: rustfs_mimalloc::MiMalloc = rustfs_mimalloc::MiMalloc;
 
-#[cfg(all(
-    not(all(feature = "hotpath", feature = "hotpath-alloc")),
-    feature = "jemalloc",
-    not(feature = "mimalloc"),
-    not(target_os = "windows")
-))]
-#[global_allocator]
-static GLOBAL: tikv_jemallocator::Jemalloc = tikv_jemallocator::Jemalloc;
-
 fn main() {
     let _hotpath_guard = hotpath::HotpathGuardBuilder::new("main").build();
 
     rustfs::startup_entrypoint::run_process();
 }
 
-#[cfg(all(
-    test,
-    feature = "hotpath",
-    feature = "hotpath-alloc",
-    feature = "mimalloc",
-    not(feature = "jemalloc"),
-    not(target_os = "windows")
-))]
+#[cfg(all(test, feature = "hotpath", feature = "hotpath-alloc", not(target_os = "windows")))]
 mod tests {
     #[test]
     // SAFETY: This test inspects a live allocation pointer with mimalloc's heap

rustfs/src/memory_observability.rs

@@ -17,7 +17,7 @@ use rustfs_io_metrics::{
     record_cpu_usage, record_memory_usage, record_process_memory_split,
 };
 use serde::Serialize;
-#[cfg(any(feature = "mimalloc", test))]
+#[cfg(any(not(target_os = "windows"), test))]
 use serde_json::Value;
 use std::path::Path;
 use std::sync::{Arc, Mutex, OnceLock};
@@ -229,7 +229,7 @@ fn read_cgroup_memory_snapshot() -> Option<CgroupMemorySnapshot> {
     read_cgroup_v2().or_else(read_cgroup_v1)
 }
 
-#[cfg(feature = "mimalloc")]
+#[cfg(not(target_os = "windows"))]
 fn read_allocator_memory_snapshot() -> Option<AllocatorMemorySnapshot> {
     let json = rustfs_mimalloc::MiMalloc::stats_json();
     if json.is_empty() {
@@ -242,12 +242,12 @@ fn read_allocator_memory_snapshot() -> Option<AllocatorMemorySnapshot> {
     })
 }
 
-#[cfg(not(feature = "mimalloc"))]
+#[cfg(target_os = "windows")]
 fn read_allocator_memory_snapshot() -> Option<AllocatorMemorySnapshot> {
     None
 }
 
-#[cfg(any(feature = "mimalloc", test))]
+#[cfg(any(not(target_os = "windows"), test))]
 fn numeric_json_value(value: &Value) -> Option<u64> {
     match value {
         Value::Number(number) => number
@@ -258,7 +258,7 @@ fn numeric_json_value(value: &Value) -> Option<u64> {
     }
 }
 
-#[cfg(any(feature = "mimalloc", test))]
+#[cfg(any(not(target_os = "windows"), test))]
 fn numeric_json_field(value: &Value, field: &str) -> Option<u64> {
     match value {
         Value::Object(fields) => fields
@@ -270,7 +270,7 @@ fn numeric_json_field(value: &Value, field: &str) -> Option<u64> {
     }
 }
 
-#[cfg(any(feature = "mimalloc", test))]
+#[cfg(any(not(target_os = "windows"), test))]
 fn mimalloc_stat_field(value: &Value, metric: &str, field: &str) -> Option<u64> {
     match value {
         Value::Object(fields) => {
@@ -287,12 +287,12 @@ fn mimalloc_stat_field(value: &Value, metric: &str, field: &str) -> Option<u64>
     }
 }
 
-#[cfg(any(feature = "mimalloc", test))]
+#[cfg(any(not(target_os = "windows"), test))]
 fn mimalloc_stat_current(value: &Value, metric: &str) -> Option<u64> {
     mimalloc_stat_field(value, metric, "current")
 }
 
-#[cfg(any(feature = "mimalloc", test))]
+#[cfg(any(not(target_os = "windows"), test))]
 fn mimalloc_stat_sum(value: &Value, metrics: &[&str], field: &str) -> Option<u64> {
     metrics
         .iter()
@@ -301,7 +301,7 @@ fn mimalloc_stat_sum(value: &Value, metrics: &[&str], field: &str) -> Option<u64
         .filter(|value| *value > 0)
 }
 
-#[cfg(any(feature = "mimalloc", test))]
+#[cfg(any(not(target_os = "windows"), test))]
 fn parse_mimalloc_stats_json(stats_json: &str) -> Option<AllocatorMemoryObservation> {
     let value = serde_json::from_str::<Value>(stats_json).ok()?;
     let malloc_metrics = ["malloc_normal", "malloc_huge"];
@@ -558,9 +558,9 @@ mod tests {
     #[test]
     fn read_allocator_memory_snapshot_uses_mimalloc_stats_json() {
         let snapshot = super::read_allocator_memory_snapshot();
-        #[cfg(all(feature = "mimalloc", not(target_os = "windows")))]
+        #[cfg(not(target_os = "windows"))]
         assert!(snapshot.is_some(), "allocator snapshot should be available on non-Windows");
-        #[cfg(not(feature = "mimalloc"))]
+        #[cfg(target_os = "windows")]
         assert!(snapshot.is_none(), "allocator snapshot should be absent without mimalloc");
     }