Try using jemalloc on windows

james58899 · Jan 8, 2024 · c255ce9 · c255ce9
1 parent f7d32c3
commit c255ce9
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 37 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -63,6 +63,8 @@ jobs:
     runs-on: windows-latest
     steps:
       - uses: actions/checkout@v3
+      - name: Install Cygwin
+        uses: cygwin/cygwin-install-action@v4
       - uses: actions/cache@v3
         with:
           path: |

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -31,15 +31,10 @@ reqwest = { version = "0.11", default-features = false, features = ["rustls-tls"
 scopeguard = "1.2"
 socket2 = "0.5"
 tempfile = "3.8"
+tikv-jemallocator = { version = "0.5", features = ["background_threads", "unprefixed_malloc_on_supported_platforms"] }
 tokio = { version = "1", features = ["full", "parking_lot"] }
 tokio-stream = { version = "0.1", default-features = false, features = ["fs"] }
 
-[target.'cfg(not(target_env = "msvc"))'.dependencies]
-tikv-jemallocator = { version = "0.5", features = ["background_threads", "unprefixed_malloc_on_supported_platforms"] }
-
-[target.'cfg(target_env = "msvc")'.dependencies]
-mimalloc = { version = "0.1", default-features = false }
-
 [target.'cfg(windows)'.dependencies]
 tray-icon = { version = "0.11", default-features = false }
 windows = { version = "*", features = ["Win32_Foundation", "Win32_System_Console", "Win32_UI_WindowsAndMessaging"] }
@@ -49,6 +44,9 @@ tao = "0.24"
 built = { version = "0.7", features = ["git2", "chrono", "semver"] }
 openssl-src = { version = "300", features = ["weak-crypto"] }
 
+[patch.crates-io]
+tikv-jemalloc-sys = { git = 'https://github.com/james58899/jemallocator', rev = 'd42449d' }
+
 [profile.release]
 lto = true
 strip = true
diff --git a/src/main.rs b/src/main.rs
@@ -25,8 +25,6 @@ use inquire::{
     CustomType, Text,
 };
 use log::{error, info, warn};
-#[cfg(target_env = "msvc")]
-use mimalloc::MiMalloc;
 use once_cell::sync::Lazy;
 use openssl::{
     pkcs12::ParsedPkcs12_2,
@@ -36,8 +34,6 @@ use parking_lot::{Mutex, RwLock};
 use regex::Regex;
 use reqwest::Proxy;
 use tempfile::TempPath;
-#[cfg(not(target_env = "msvc"))]
-use tikv_jemallocator::Jemalloc;
 use tokio::{
     fs::{self, try_exists, File},
     io::{stderr, stdin, AsyncBufReadExt, AsyncReadExt, AsyncWriteExt, BufReader},
@@ -68,12 +64,8 @@ mod rpc;
 mod rpc_http_client;
 mod util;
 
-#[cfg(not(target_env = "msvc"))]
 #[global_allocator]
-static GLOBAL: Jemalloc = Jemalloc;
-#[cfg(target_env = "msvc")]
-#[global_allocator]
-static GLOBAL: MiMalloc = MiMalloc;
+static GLOBAL: tikv_jemallocator::Jemalloc = tikv_jemallocator::Jemalloc;
 
 static VERSION: Lazy<String> = Lazy::new(|| {
     format!(