diff --git a/Cargo.lock b/Cargo.lock index 3c86830..cef6980 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1496,16 +1496,6 @@ version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa" -[[package]] -name = "libmimalloc-sys" -version = "0.1.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07d0e07885d6a754b9c7993f2625187ad694ee985d60f23355ff0e7077261502" -dependencies = [ - "cc", - "libc", -] - [[package]] name = "linux-raw-sys" version = "0.4.15" @@ -1563,15 +1553,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "mimalloc" -version = "0.1.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99585191385958383e13f6b822e6b6d8d9cf928e7d286ceb092da92b43c87bc1" -dependencies = [ - "libmimalloc-sys", -] - [[package]] name = "minimal-lexical" version = "0.2.1" @@ -2093,7 +2074,6 @@ dependencies = [ "clap", "futures-util", "hot_reload", - "mimalloc", "rpxy-acme", "rpxy-certs", "rpxy-lib", diff --git a/rpxy-bin/Cargo.toml b/rpxy-bin/Cargo.toml index 51d1f5d..d6cb213 100644 --- a/rpxy-bin/Cargo.toml +++ b/rpxy-bin/Cargo.toml @@ -29,7 +29,8 @@ rpxy-lib = { path = "../rpxy-lib/", default-features = false, features = [ "sticky-cookie", ] } -mimalloc = { version = "*", default-features = false } +# TODO: stop using mimalloc doe to compilation failure by musl +# mimalloc = { version = "*", default-features = false } anyhow = "1.0.97" ahash = "0.8.11" serde = { version = "1.0.219", default-features = false, features = ["derive"] } diff --git a/rpxy-bin/src/main.rs b/rpxy-bin/src/main.rs index 855561f..9af0144 100644 --- a/rpxy-bin/src/main.rs +++ b/rpxy-bin/src/main.rs @@ -1,5 +1,5 @@ -#[global_allocator] -static ALLOC: mimalloc::MiMalloc = mimalloc::MiMalloc; +// #[global_allocator] +// static ALLOC: mimalloc::MiMalloc = mimalloc::MiMalloc; mod config; mod constants; @@ -9,13 +9,13 @@ mod log; #[cfg(feature = "acme")] use crate::config::build_acme_manager; use crate::{ - config::{build_cert_manager, build_settings, parse_opts, ConfigToml, ConfigTomlReloader}, + config::{ConfigToml, ConfigTomlReloader, build_cert_manager, build_settings, parse_opts}, constants::CONFIG_WATCH_DELAY_SECS, error::*, log::*, }; use hot_reload::{ReloaderReceiver, ReloaderService}; -use rpxy_lib::{entrypoint, RpxyOptions, RpxyOptionsBuilder}; +use rpxy_lib::{RpxyOptions, RpxyOptionsBuilder, entrypoint}; use std::sync::Arc; use tokio_util::sync::CancellationToken;