Skip to content

Commit

Permalink
patch(deps): Temporarily remove jemallocator
Browse files Browse the repository at this point in the history
  • Loading branch information
cratelyn committed Sep 4, 2024
1 parent 23dda3c commit 6802c00
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 26 deletions.
21 changes: 0 additions & 21 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -991,26 +991,6 @@ version = "1.0.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"

[[package]]
name = "jemalloc-sys"
version = "0.5.4+5.3.0-patched"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ac6c1946e1cea1788cbfde01c993b52a10e2da07f4bac608228d1bed20bfebf2"
dependencies = [
"cc",
"libc",
]

[[package]]
name = "jemallocator"
version = "0.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a0de374a9f8e63150e6f5e8a60cc14c668226d7a347d8aee1a45766e3c4dd3bc"
dependencies = [
"jemalloc-sys",
"libc",
]

[[package]]
name = "jobserver"
version = "0.1.32"
Expand Down Expand Up @@ -2295,7 +2275,6 @@ name = "linkerd2-proxy"
version = "0.1.0"
dependencies = [
"futures",
"jemallocator",
"linkerd-app",
"linkerd-meshtls",
"linkerd-metrics",
Expand Down
5 changes: 3 additions & 2 deletions linkerd2-proxy/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,6 @@ linkerd-signal = { path = "../linkerd/signal" }
tokio = { version = "1", features = ["rt", "time", "net"] }
tracing = "0.1"

[target.x86_64-unknown-linux-gnu.dependencies]
jemallocator = { version = "0.5" }
# XXX(kate): disable the jemallocator
# [target.x86_64-unknown-linux-gnu.dependencies]
# jemallocator = { package = "tikv-jemallocator", version = "0.6.0" }
7 changes: 4 additions & 3 deletions linkerd2-proxy/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,10 @@ use linkerd_signal as signal;
use tokio::{sync::mpsc, time};
use tracing::{debug, info, warn};

#[cfg(all(target_os = "linux", target_arch = "x86_64", target_env = "gnu"))]
#[global_allocator]
static GLOBAL: jemallocator::Jemalloc = jemallocator::Jemalloc;
// XXX(kate): disable jemallocator
// #[cfg(all(target_os = "linux", target_arch = "x86_64", target_env = "gnu"))]
// #[global_allocator]
// static GLOBAL: jemallocator::Jemalloc = jemallocator::Jemalloc;

mod rt;

Expand Down

0 comments on commit 6802c00

Please sign in to comment.