difftreelog
feat gc options
in: master
4 files changed
Cargo.lockdiffbeforeafterboth158dependencies = [158dependencies = [159 "clap",159 "clap",160 "jrsonnet-evaluator",160 "jrsonnet-evaluator",161 "jrsonnet-gc",161 "jrsonnet-parser",162 "jrsonnet-parser",162]163]163164cmds/jrsonnet/src/main.rsdiffbeforeafterboth1use clap::{AppSettings, Clap, IntoApp};1use clap::{AppSettings, Clap, IntoApp};2use jrsonnet_cli::{ConfigureState, GeneralOpts, InputOpts, ManifestOpts, OutputOpts};2use jrsonnet_cli::{ConfigureState, GcOpts, GeneralOpts, InputOpts, ManifestOpts, OutputOpts};3use jrsonnet_evaluator::{error::LocError, EvaluationState, ManifestFormat};3use jrsonnet_evaluator::{error::LocError, EvaluationState, ManifestFormat};4use std::{4use std::{5 fs::{create_dir_all, File},5 fs::{create_dir_all, File},61 output: OutputOpts,61 output: OutputOpts,62 #[clap(flatten)]62 #[clap(flatten)]63 debug: DebugOpts,63 debug: DebugOpts,64 #[clap(flatten)]65 gc: GcOpts,64}66}656766fn main() {68fn main() {114}116}115117116fn main_catch(opts: Opts) -> bool {118fn main_catch(opts: Opts) -> bool {119 let _printer = opts.gc.stats_printer();117 let state = EvaluationState::default();120 let state = EvaluationState::default();118 if let Err(e) = main_real(&state, opts) {121 if let Err(e) = main_real(&state, opts) {119 if let Error::Evaluation(e) = e {122 if let Error::Evaluation(e) = e {127}130}128131129fn main_real(state: &EvaluationState, opts: Opts) -> Result<(), Error> {132fn main_real(state: &EvaluationState, opts: Opts) -> Result<(), Error> {133 opts.gc.configure_global();130 opts.general.configure(&state)?;134 opts.general.configure(&state)?;131 opts.manifest.configure(&state)?;135 opts.manifest.configure(&state)?;132136crates/jrsonnet-cli/Cargo.tomldiffbeforeafterboth10[dependencies]10[dependencies]11jrsonnet-evaluator = { path = "../../crates/jrsonnet-evaluator", version = "0.3.6", features = ["explaining-traces"] }11jrsonnet-evaluator = { path = "../../crates/jrsonnet-evaluator", version = "0.3.6", features = ["explaining-traces"] }12jrsonnet-parser = { path = "../../crates/jrsonnet-parser", version = "0.3.6" }12jrsonnet-parser = { path = "../../crates/jrsonnet-parser", version = "0.3.6" }13jrsonnet-gc = { version = "0.4.2", features = ["derive", "unstable-config", "unstable-stats"] }131414[dependencies.clap]15[dependencies.clap]15git = "https://github.com/clap-rs/clap"16git = "https://github.com/clap-rs/clap"crates/jrsonnet-cli/src/lib.rsdiffbeforeafterboth96 }96 }97}97}9899#[derive(Clap)]100#[clap(help_heading = "GARBAGE COLLECTION")]101pub struct GcOpts {102 /// Min bytes allocated to start garbage collection103 #[clap(long, default_value = "20000000")]104 gc_initial_threshold: usize,105 /// How much heap should grow after unsuccessful garbage collection106 #[clap(long)]107 gc_used_space_ratio: Option<f64>,108 /// Do not skip gc on exit109 #[clap(long)]110 gc_collect_on_exit: bool,111 /// Print gc stats before exit112 #[clap(long)]113 gc_print_stats: bool,114 /// Force garbage collection before printing stats115 /// Useful for checking for memory leaks116 /// Does nothing useless --gc-print-stats is specified117 #[clap(long)]118 gc_collect_before_printing_stats: bool,119}120impl GcOpts {121 pub fn stats_printer(&self) -> Option<GcStatsPrinter> {122 self.gc_print_stats123 .then(|| GcStatsPrinter(self.gc_collect_before_printing_stats))124 }125 pub fn configure_global(&self) {126 jrsonnet_gc::configure(|config| {127 config.leak_on_drop = !self.gc_collect_on_exit;128 config.threshold = self.gc_initial_threshold;129 if let Some(used_space_ratio) = self.gc_used_space_ratio {130 config.used_space_ratio = used_space_ratio;131 }132 });133 }134}135pub struct GcStatsPrinter(bool);136impl Drop for GcStatsPrinter {137 fn drop(&mut self) {138 if self.0 {139 jrsonnet_gc::force_collect()140 }141 eprintln!("=== GC STATS ===");142 jrsonnet_gc::configure(|c| {143 eprintln!("Final threshold: {:?}", c.threshold);144 });145 let stats = jrsonnet_gc::stats();146 eprintln!("Collections performed: {}", stats.collections_performed);147 eprintln!("Bytes still allocated: {}", stats.bytes_allocated);148 }149}98150