Always use mimalloc as the global allocator

This commit is contained in:
Loïc Lecrenier 2022-08-16 20:09:36 +02:00
parent fb2b6c0c28
commit 20be69e1b9
10 changed files with 10 additions and 22 deletions

View File

@ -18,6 +18,5 @@ byte-unit = { version = "4.0.14", features = ["serde"] }
bimap = "0.6.2" bimap = "0.6.2"
csv = "1.1.6" csv = "1.1.6"
stderrlog = "0.5.1" stderrlog = "0.5.1"
mimalloc = { version = "0.1.29", default-features = false }
[target.'cfg(target_os = "linux")'.dependencies]
jemallocator = "0.3.2"

View File

@ -16,9 +16,8 @@ use milli::update::{self, IndexDocumentsConfig, IndexDocumentsMethod, IndexerCon
use milli::{Index, Object}; use milli::{Index, Object};
use structopt::StructOpt; use structopt::StructOpt;
#[cfg(target_os = "linux")]
#[global_allocator] #[global_allocator]
static ALLOC: jemallocator::Jemalloc = jemallocator::Jemalloc; static ALLOC: mimalloc::MiMalloc = mimalloc::MiMalloc;
#[derive(Debug, StructOpt)] #[derive(Debug, StructOpt)]
#[structopt(name = "Milli CLI", about = "A simple CLI to manipulate a milli index.")] #[structopt(name = "Milli CLI", about = "A simple CLI to manipulate a milli index.")]

View File

@ -14,5 +14,4 @@ milli = { path = "../milli" }
stderrlog = "0.5.1" stderrlog = "0.5.1"
structopt = { version = "0.3.26", default-features = false } structopt = { version = "0.3.26", default-features = false }
[target.'cfg(target_os = "linux")'.dependencies] mimalloc = { version = "0.1.29", default-features = false }
jemallocator = "0.3.2"

View File

@ -5,9 +5,8 @@ use heed::{CompactionOption, Env, EnvOpenOptions};
use structopt::StructOpt; use structopt::StructOpt;
use Command::*; use Command::*;
#[cfg(target_os = "linux")]
#[global_allocator] #[global_allocator]
static ALLOC: jemallocator::Jemalloc = jemallocator::Jemalloc; static ALLOC: mimalloc::MiMalloc = mimalloc::MiMalloc;
#[derive(Debug, StructOpt)] #[derive(Debug, StructOpt)]
/// Some helpers commands for milli. /// Some helpers commands for milli.

View File

@ -30,6 +30,7 @@ serde_json = { version = "1.0.79", features = ["preserve_order"] }
tokio = { version = "1.17.0", features = ["full"] } tokio = { version = "1.17.0", features = ["full"] }
tokio-stream = { version = "0.1.8", default-features = false, features = ["sync"] } tokio-stream = { version = "0.1.8", default-features = false, features = ["sync"] }
warp = "0.3.2" warp = "0.3.2"
mimalloc = { version = "0.1.29", default-features = false }
# logging # logging
log = "0.4.14" log = "0.4.14"
@ -45,5 +46,3 @@ csv = "1.1.6"
maplit = "1.0.2" maplit = "1.0.2"
serde_test = "1.0.136" serde_test = "1.0.136"
[target.'cfg(target_os = "linux")'.dependencies]
jemallocator = "0.3.2"

View File

@ -42,9 +42,8 @@ use warp::Filter;
use self::update_store::UpdateStore; use self::update_store::UpdateStore;
#[cfg(target_os = "linux")]
#[global_allocator] #[global_allocator]
static ALLOC: jemallocator::Jemalloc = jemallocator::Jemalloc; static ALLOC: mimalloc::MiMalloc = mimalloc::MiMalloc;
static GLOBAL_CONFIG: OnceCell<IndexerConfig> = OnceCell::new(); static GLOBAL_CONFIG: OnceCell<IndexerConfig> = OnceCell::new();

View File

@ -15,6 +15,4 @@ roaring = "0.9.0"
serde_json = "1.0.79" serde_json = "1.0.79"
stderrlog = "0.5.1" stderrlog = "0.5.1"
structopt = { version = "0.3.26", default-features = false } structopt = { version = "0.3.26", default-features = false }
mimalloc = { version = "0.1.29", default-features = false }
[target.'cfg(target_os = "linux")'.dependencies]
jemallocator = "0.3.2"

View File

@ -11,9 +11,8 @@ use milli::{FieldId, Index};
use structopt::StructOpt; use structopt::StructOpt;
use Command::*; use Command::*;
#[cfg(target_os = "linux")]
#[global_allocator] #[global_allocator]
static ALLOC: jemallocator::Jemalloc = jemallocator::Jemalloc; static ALLOC: mimalloc::MiMalloc = mimalloc::MiMalloc;
const ALL_DATABASE_NAMES: &[&str] = &[ const ALL_DATABASE_NAMES: &[&str] = &[
MAIN, MAIN,

View File

@ -16,9 +16,7 @@ serde_json = { version = "1.0.62", features = ["preserve_order"] }
anyhow = "1.0" anyhow = "1.0"
tempfile = "3.3" tempfile = "3.3"
arbitrary-json = "0.1.0" arbitrary-json = "0.1.0"
mimalloc = { version = "0.1.29", default-features = false }
[target.'cfg(target_os = "linux")'.dependencies]
jemallocator = "0.3.2"
[dependencies.milli] [dependencies.milli]
path = ".." path = ".."

View File

@ -12,9 +12,8 @@ use milli::update::{IndexDocuments, IndexDocumentsConfig, IndexerConfig, Setting
use milli::Index; use milli::Index;
use serde_json::{Map, Value}; use serde_json::{Map, Value};
#[cfg(target_os = "linux")]
#[global_allocator] #[global_allocator]
static ALLOC: jemallocator::Jemalloc = jemallocator::Jemalloc; static ALLOC: mimalloc::MiMalloc = mimalloc::MiMalloc;
/// reads json from input and write an obkv batch to writer. /// reads json from input and write an obkv batch to writer.
pub fn read_json(input: impl Read, writer: impl Write + Seek) -> Result<usize> { pub fn read_json(input: impl Read, writer: impl Write + Seek) -> Result<usize> {