From b179d3676bb8046cf2bbdd62e15404a075b5b596 Mon Sep 17 00:00:00 2001 From: monosans Date: Sun, 3 May 2026 19:43:59 +0300 Subject: [PATCH] fix: update allocator configurations and dependencies in workflows and Cargo.toml --- .github/workflows/allocator-bench.yml | 7 ------- Cargo.toml | 14 +++++--------- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/.github/workflows/allocator-bench.yml b/.github/workflows/allocator-bench.yml index ed9b25d..7f5b003 100644 --- a/.github/workflows/allocator-bench.yml +++ b/.github/workflows/allocator-bench.yml @@ -16,11 +16,8 @@ jobs: allocator: - system - jemalloc - - jemalloc_override - mimalloc_v2 - - mimalloc_v2_override - mimalloc_v3 - - mimalloc_v3_override tokio_multi_thread: [true, false] platform: - ubuntu-24.04-arm @@ -59,12 +56,8 @@ jobs: exclude: - platform: windows-2025 allocator: jemalloc - - platform: windows-2025 - allocator: jemalloc_override - platform: windows-11-arm allocator: jemalloc - - platform: windows-11-arm - allocator: jemalloc_override steps: - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 with: diff --git a/Cargo.toml b/Cargo.toml index e7a863c..3ac3866 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -31,7 +31,7 @@ log = { version = "=0.4.29", features = [ "std", ] } maxminddb = { version = "=0.28.1", features = ["mmap"] } -mimalloc = { version = "=0.1.50", optional = true } +mimalloc = { version = "=0.1.50", features = ["override"], optional = true } parking_lot = "=0.12.5" rand = { version = "=0.10.1", default-features = false, features = [ "std", @@ -58,7 +58,9 @@ smallvec = { version = "=1.15.1", features = [ "union", ], optional = true } strum = { version = "=0.28.0", features = ["derive"], optional = true } -tikv-jemallocator = { version = "=0.6.1", optional = true } +tikv-jemallocator = { version = "=0.6.1", features = [ + "unprefixed_malloc_on_supported_platforms" +], optional = true } tokio = { version = "=1.52.1", features = ["fs", "parking_lot", "signal"] } tokio-util = "=0.7.18" toml = { version = "=1.1.2", default-features = false, features = [ @@ -80,17 +82,11 @@ url = "=2.5.8" [features] # default = ["auto-allocator"] __mimalloc = ["dep:mimalloc"] -auto-allocator = ["mimalloc_v3_override"] +auto-allocator = ["mimalloc_v3"] dhat = ["dep:dhat"] jemalloc = ["dep:tikv-jemallocator"] -jemalloc_override = [ - "jemalloc", - "tikv-jemallocator/unprefixed_malloc_on_supported_platforms" -] mimalloc_v2 = ["__mimalloc", "mimalloc/v2"] -mimalloc_v2_override = ["mimalloc_v2", "mimalloc/override"] mimalloc_v3 = ["__mimalloc"] -mimalloc_v3_override = ["mimalloc_v3", "mimalloc/override"] tokio-multi-thread = [] tui = [ "dep:crossterm",