serv/conduit
1
0
Fork 0
mirror of https://gitlab.com/famedly/conduit.git synced 2024-12-27 21:13:47 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'jemallocfeature' into 'next'

Browse source 
feat: allow disabling jemalloc via feature

See merge request famedly/conduit!285
This commit is contained in:
Timo Kösters 2022-02-04 17:08:03 +00:00
commit d55992dc83
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Cargo.toml
View file

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

4
src/main.rs
View file

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