Merge branch 'jemallocfeature' into 'next'

feat: allow disabling jemalloc via feature

See merge request famedly/conduit!285

Cargo.toml

@@ -86,17 +86,17 @@ sha-1 = "0.9.8"
 clap = { version = "3.0.10", default-features = false, features = ["std", "derive"] }
 maplit = "1.0.2"
 
-[target.'cfg(not(target_env = "msvc"))'.dependencies]
-tikv-jemalloc-ctl = { version = "0.4.2", features = ['use_std'] }
-tikv-jemallocator = { version = "0.4.1", features = ['unprefixed_malloc_on_supported_platforms'] }
+tikv-jemalloc-ctl = { version = "0.4.2", features = ["use_std"], optional = true }
+tikv-jemallocator = { version = "0.4.1", features = ["unprefixed_malloc_on_supported_platforms"], optional = true }
 
 [features]
-default = ["conduit_bin", "backend_sqlite", "backend_rocksdb"]
+default = ["conduit_bin", "backend_sqlite", "backend_rocksdb", "jemalloc"]
 backend_sled = ["sled"]
 backend_persy = ["persy", "parking_lot"]
 backend_sqlite = ["sqlite"]
 backend_heed = ["heed", "crossbeam"]
 backend_rocksdb = ["rocksdb"]
+jemalloc = ["tikv-jemalloc-ctl", "tikv-jemallocator"]
 sqlite = ["rusqlite", "parking_lot", "tokio/signal"]
 conduit_bin = [] # TODO: add rocket to this when it is optional
 

src/main.rs

@@ -26,10 +26,10 @@ use tracing_subscriber::{prelude::*, EnvFilter};
 pub use conduit::*; // Re-export everything from the library crate
 pub use rocket::State;
 
-#[cfg(not(target_env = "msvc"))]
+#[cfg(all(not(target_env = "msvc"), feature = "jemalloc"))]
 use tikv_jemallocator::Jemalloc;
 
-#[cfg(not(target_env = "msvc"))]
+#[cfg(all(not(target_env = "msvc"), feature = "jemalloc"))]
 #[global_allocator]
 static GLOBAL: Jemalloc = Jemalloc;