tuxmain/rust-rpxy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: stop using mimalloc due to compilation failure with musl

Browse source
This commit is contained in:
Jun Kurihara 2025-04-03 13:11:24 +09:00
commit e31e61485d
No known key found for this signature in database
GPG key ID: B184DE07B34AA676
3 changed files with 6 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Cargo.lock generated
View file

@ -1496,16 +1496,6 @@ version = "0.2.11"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa" 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]] [[package]]
name = "linux-raw-sys" name = "linux-raw-sys"
version = "0.4.15" version = "0.4.15"
@ -1563,15 +1553,6 @@ dependencies = [
"autocfg", "autocfg",
] ]
[[package]]
name = "mimalloc"
version = "0.1.44"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "99585191385958383e13f6b822e6b6d8d9cf928e7d286ceb092da92b43c87bc1"
dependencies = [
"libmimalloc-sys",
]
[[package]] [[package]]
name = "minimal-lexical" name = "minimal-lexical"
version = "0.2.1" version = "0.2.1"
@ -2093,7 +2074,6 @@ dependencies = [
"clap", "clap",
"futures-util", "futures-util",
"hot_reload", "hot_reload",
"mimalloc",
"rpxy-acme", "rpxy-acme",
"rpxy-certs", "rpxy-certs",
"rpxy-lib", "rpxy-lib",

3
rpxy-bin/Cargo.toml
View file

@ -29,7 +29,8 @@ rpxy-lib = { path = "../rpxy-lib/", default-features = false, features = [
"sticky-cookie", "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" anyhow = "1.0.97"
ahash = "0.8.11" ahash = "0.8.11"
serde = { version = "1.0.219", default-features = false, features = ["derive"] } serde = { version = "1.0.219", default-features = false, features = ["derive"] }

8
rpxy-bin/src/main.rs
View file

@ -1,5 +1,5 @@
#[global_allocator] // #[global_allocator]
static ALLOC: mimalloc::MiMalloc = mimalloc::MiMalloc; // static ALLOC: mimalloc::MiMalloc = mimalloc::MiMalloc;
mod config; mod config;
mod constants; mod constants;
@ -9,13 +9,13 @@ mod log;
#[cfg(feature = "acme")] #[cfg(feature = "acme")]
use crate::config::build_acme_manager; use crate::config::build_acme_manager;
use crate::{ 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, constants::CONFIG_WATCH_DELAY_SECS,
error::*, error::*,
log::*, log::*,
}; };
use hot_reload::{ReloaderReceiver, ReloaderService}; use hot_reload::{ReloaderReceiver, ReloaderService};
use rpxy_lib::{entrypoint, RpxyOptions, RpxyOptionsBuilder}; use rpxy_lib::{RpxyOptions, RpxyOptionsBuilder, entrypoint};
use std::sync::Arc; use std::sync::Arc;
use tokio_util::sync::CancellationToken; use tokio_util::sync::CancellationToken;