difftreelog
feat make mimalloc optional
in: master
2 files changed
cmds/jrsonnet/Cargo.tomldiffbeforeafterboth--- a/cmds/jrsonnet/Cargo.toml
+++ b/cmds/jrsonnet/Cargo.toml
@@ -8,12 +8,17 @@
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+[features]
+default = []
+# Use mimalloc as allocator
+mimalloc = []
+
[dependencies]
jrsonnet-evaluator = { path = "../../crates/jrsonnet-evaluator", version = "1.0.0" }
jrsonnet-parser = { path = "../../crates/jrsonnet-parser", version = "1.0.0" }
jrsonnet-cli = { path = "../../crates/jrsonnet-cli", version = "0.1.0" }
# TODO: Fix mimalloc compile errors, and use them
-mimallocator = "0.1.3"
+mimallocator = { version = "0.1.3", optional = true }
[dependencies.clap]
git = "https://github.com/clap-rs/clap"
cmds/jrsonnet/src/main.rsdiffbeforeafterboth1use clap::Clap;2use jrsonnet_cli::{ConfigureState, GeneralOpts, InputOpts, ManifestOpts};3use jrsonnet_evaluator::{error::Result, EvaluationState};4use std::{path::PathBuf, rc::Rc};56#[global_allocator]7static GLOBAL: mimallocator::Mimalloc = mimallocator::Mimalloc;89#[derive(Clap)]10// #[clap(help_heading = "DEBUG")]11struct DebugOpts {12 /// Required OS stack size, probally you shouldn't change it, unless jrsonnet is failing with stack overflow13 #[clap(long, name = "size")]14 pub os_stack: Option<usize>,15}1617#[derive(Clap)]18struct Opts {19 #[clap(flatten)]20 input: InputOpts,21 #[clap(flatten)]22 general: GeneralOpts,23 #[clap(flatten)]24 manifest: ManifestOpts,25 #[clap(flatten)]26 debug: DebugOpts,27}2829fn main() {30 let opts: Opts = Opts::parse();31 if let Some(size) = opts.debug.os_stack {32 std::thread::Builder::new()33 .stack_size(size * 1024 * 1024)34 .spawn(|| main_catch(opts))35 .expect("new thread spawned")36 .join()37 .expect("thread finished successfully");38 } else {39 main_catch(opts)40 }41}4243fn main_catch(opts: Opts) {44 let state = EvaluationState::default();45 if let Err(e) = main_real(&state, opts) {46 println!("{}", state.stringify_err(&e));47 }48}4950fn main_real(state: &EvaluationState, opts: Opts) -> Result<()> {51 opts.general.configure(&state)?;52 opts.manifest.configure(&state)?;5354 let val = if opts.input.evaluate {55 state.evaluate_snippet_raw(56 Rc::new(PathBuf::from("args")),57 (&opts.input.input as &str).into(),58 )?59 } else {60 state.evaluate_file_raw(&PathBuf::from(opts.input.input))?61 };6263 let val = state.with_tla(val)?;6465 println!("{}", state.manifest(val)?);6667 Ok(())68}