feat: use je for non-linux

web-infra-dev · Nov 1, 2024 · 6e16de2 · 6e16de2
1 parent bcba230
commit 6e16de2
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 6 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/rspack_allocator/Cargo.toml b/crates/rspack_allocator/Cargo.toml
@@ -7,9 +7,9 @@ repository  = "https://github.com/web-infra-dev/rspack"
 version     = "0.1.0"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
-[target.'cfg(target_os = "linux")'.dependencies]
+[target.'cfg(any(target_os = "linux", target_env = "msvc"))'.dependencies]
 # Turned on `local_dynamic_tls` to avoid issue: https://github.com/microsoft/mimalloc/issues/147
 mimalloc = { workspace = true, features = ["local_dynamic_tls"] }
 
-[target.'cfg(not(target_os = "linux"))'.dependencies]
-mimalloc = { workspace = true }
+[target.'cfg(not(any(target_os = "linux", target_env = "msvc")))'.dependencies]
+tikv-jemallocator = "0.6"
diff --git a/crates/rspack_allocator/src/lib.rs b/crates/rspack_allocator/src/lib.rs
@@ -1,4 +1,7 @@
-// use mimalloc::MiMalloc;
+#[cfg(not(any(target_os = "linux", target_env = "msvc")))]
+#[global_allocator]
+static GLOBAL: tikv_jemallocator::Jemalloc = tikv_jemallocator::Jemalloc;
 
-// #[global_allocator]
-// static GLOBAL: MiMalloc = MiMalloc;
+#[cfg(any(target_os = "linux", target_env = "msvc"))]
+#[global_allocator]
+static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc;