Skip to content

Commit a7a40ff

Browse files
committed
Auto merge of #1953 - jtgeibel:update/jemallocator, r=smarnach
Upgrade `jemallocator` Background threads are now enabled for all artifacts by enabling the `background_threads` feature. Reviewing `jemalloc-sys` shows the underlying `jemalloc` version remains unchanged at 5.1, so this is not expected to affect runtime behavior in production. Refs: #1265
2 parents 55fa81b + 8671445 commit a7a40ff

File tree

3 files changed

+7
-22
lines changed

3 files changed

+7
-22
lines changed

Cargo.lock

Lines changed: 6 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,7 @@ derive_deref = "1.0.0"
6060
reqwest = "0.9.1"
6161
tempdir = "0.3.7"
6262
parking_lot = "0.7.1"
63-
jemallocator = { version = "0.1.8", features = ['unprefixed_malloc_on_supported_platforms', 'profiling'] }
64-
jemalloc-ctl = "0.2.0"
63+
jemallocator = { version = "0.3", features = ['unprefixed_malloc_on_supported_platforms', 'profiling', "background_threads"] }
6564

6665
lettre = "0.9"
6766
lettre_email = "0.9"

src/bin/server.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ use std::{
1111
use civet::Server as CivetServer;
1212
use conduit_hyper::Service as HyperService;
1313
use futures::Future;
14-
use jemalloc_ctl;
1514
use reqwest::Client;
1615

1716
enum Server {
@@ -22,8 +21,6 @@ enum Server {
2221
use Server::*;
2322

2423
fn main() {
25-
let _ = jemalloc_ctl::set_background_thread(true);
26-
2724
// Initialize logging
2825
env_logger::init();
2926

0 commit comments

Comments
 (0)