From bde2637fa85fc0a5cb0e54c0ec41cb6928ffe05f Mon Sep 17 00:00:00 2001 From: Yaroslav Bolyukin Date: Sun, 05 Jun 2022 12:53:43 +0000 Subject: [PATCH] build: switch to released gcmodule fork --- --- a/Cargo.lock +++ b/Cargo.lock @@ -25,9 +25,9 @@ [[package]] name = "anyhow" -version = "1.0.49" +version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a03e93e97a28fbc9f42fbc5ba0886a3c67eb637b476dbee711f80a6ffe8223d" +checksum = "08f9b8508dccb7687a1d6c4ce66b2b0ecef467c94667de27d8d7fe1f8d2a9cdc" [[package]] name = "atty" @@ -42,9 +42,9 @@ [[package]] name = "autocfg" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "base64" @@ -69,9 +69,9 @@ [[package]] name = "cc" -version = "1.0.72" +version = "1.0.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22a9137b95ea06864e018375b72adfb7db6e6f68cfc8df5a04d00288050485ee" +checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" [[package]] name = "cfg-if" @@ -87,9 +87,9 @@ [[package]] name = "clap" -version = "3.1.13" +version = "3.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4b3ee449efa0c4f95cd48b00539829d3655a98e189a90617246492788d22404" +checksum = "d2dbdf4bdacb33466e854ce889eee8dfd5729abf7ccd7664d0a2d60cd384440b" dependencies = [ "atty", "bitflags", @@ -104,18 +104,18 @@ [[package]] name = "clap_complete" -version = "3.1.3" +version = "3.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d7ca9141e27e6ebc52e3c378b0c07f3cea52db46ed1cc5861735fb697b56356" +checksum = "da92e6facd8d73c22745a5d3cbb59bdf8e46e3235c923e516527d8e81eec14a4" dependencies = [ "clap", ] [[package]] name = "clap_derive" -version = "3.1.7" +version = "3.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3aab4734e083b809aaf5794e14e756d1c798d2c69c7f7de7a09a2f5214993c1" +checksum = "25320346e922cffe59c0bbc5410c8d8784509efb321488971081313cb1e1a33c" dependencies = [ "heck", "proc-macro-error", @@ -147,26 +147,6 @@ version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0" - -[[package]] -name = "gcmodule" -version = "0.3.3" -source = "git+https://github.com/CertainLach/gcmodule?branch=jrsonnet#f72713c24c2b1bf5a78f1d01bee5a0f52bc2a094" -dependencies = [ - "gcmodule_derive", - "parking_lot", -] - -[[package]] -name = "gcmodule_derive" -version = "0.3.3" -source = "git+https://github.com/CertainLach/gcmodule?branch=jrsonnet#f72713c24c2b1bf5a78f1d01bee5a0f52bc2a094" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "synstructure", -] [[package]] name = "getrandom" @@ -211,9 +191,9 @@ [[package]] name = "indexmap" -version = "1.7.0" +version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5" +checksum = "e6012d540c5baa3589337a98ce73408de9b5a25ec9fc2c6fd6be8f0d39e0ca5a" dependencies = [ "autocfg", "hashbrown 0.11.2", @@ -221,9 +201,9 @@ [[package]] name = "itoa" -version = "0.4.8" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" +checksum = "112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d" [[package]] name = "jrsonnet" @@ -231,9 +211,9 @@ dependencies = [ "clap", "clap_complete", - "gcmodule", "jrsonnet-cli", "jrsonnet-evaluator", + "jrsonnet-gcmodule", "jrsonnet-parser", "mimallocator", "thiserror", @@ -244,8 +224,8 @@ version = "0.4.2" dependencies = [ "clap", - "gcmodule", "jrsonnet-evaluator", + "jrsonnet-gcmodule", "jrsonnet-parser", ] @@ -257,8 +237,8 @@ "anyhow", "base64", "bincode", - "gcmodule", "hashbrown 0.12.1", + "jrsonnet-gcmodule", "jrsonnet-interner", "jrsonnet-macros", "jrsonnet-parser", @@ -276,11 +256,32 @@ ] [[package]] +name = "jrsonnet-gcmodule" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22d4e1572e4b61e4f5deb3701312a330df0e69b48805a540d740e5e53ac8c78a" +dependencies = [ + "jrsonnet-gcmodule-derive", + "parking_lot", +] + +[[package]] +name = "jrsonnet-gcmodule-derive" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae2f3bf7d38e0a9098b5b9062a7d9e7a97a206bc3c91118d76e7e37f2e0f1202" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] name = "jrsonnet-interner" version = "0.4.2" dependencies = [ - "gcmodule", "hashbrown 0.12.1", + "jrsonnet-gcmodule", "rustc-hash", "serde", ] @@ -298,7 +299,7 @@ name = "jrsonnet-parser" version = "0.4.2" dependencies = [ - "gcmodule", + "jrsonnet-gcmodule", "jrsonnet-interner", "jrsonnet-stdlib", "peg", @@ -314,7 +315,7 @@ name = "jrsonnet-types" version = "0.4.2" dependencies = [ - "gcmodule", + "jrsonnet-gcmodule", "peg", ] @@ -322,8 +323,8 @@ name = "jsonnet" version = "0.4.2" dependencies = [ - "gcmodule", "jrsonnet-evaluator", + "jrsonnet-gcmodule", "jrsonnet-parser", ] @@ -335,9 +336,9 @@ [[package]] name = "libc" -version = "0.2.125" +version = "0.2.126" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5916d2ae698f6de9bfb891ad7a8d65c09d232dc58cc4ac433c7da3b2fd84bc2b" +checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836" [[package]] name = "linked-hash-map" @@ -381,15 +382,15 @@ [[package]] name = "once_cell" -version = "1.10.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9" +checksum = "7709cef83f0c1f58f666e746a08b21e0085f7440fa6a29cc194d68aac97a4225" [[package]] name = "os_str_bytes" -version = "6.0.0" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e22443d1643a904602595ba1cd8f7d896afe56d26712531c5ff73a15b2fbf64" +checksum = "21326818e99cfe6ce1e524c2a805c189a99b5ae555a35d19f9a284b427d86afa" [[package]] name = "parking_lot" @@ -474,18 +475,18 @@ [[package]] name = "proc-macro2" -version = "1.0.32" +version = "1.0.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba508cc11742c0dc5c1659771673afbab7a0efab23aa17e854cbab0837ed0b43" +checksum = "c54b25569025b7fc9651de43004ae593a75ad88543b17178aa5e1b9c4f15f56f" dependencies = [ - "unicode-xid", + "unicode-ident", ] [[package]] name = "quote" -version = "1.0.10" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38bc8cc6a5f2e3655e0899c1b848643b2562f853f114bfec7be120678e3ace05" +checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1" dependencies = [ "proc-macro2", ] @@ -504,9 +505,9 @@ [[package]] name = "ryu" -version = "1.0.5" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" +checksum = "f3f6f92acf49d1b98f7a81226834412ada05458b7364277387724a237f062695" [[package]] name = "scopeguard" @@ -516,18 +517,18 @@ [[package]] name = "serde" -version = "1.0.130" +version = "1.0.137" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f12d06de37cf59146fbdecab66aa99f9fe4f78722e3607577a5375d66bd0c913" +checksum = "61ea8d54c77f8315140a05f4c7237403bf38b72704d031543aa1d16abbf517d1" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.130" +version = "1.0.137" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7bc1a1ab1961464eae040d96713baa5a724a8152c1222492465b54322ec508b" +checksum = "1f26faba0c3959972377d3b2d306ee9f71faee9714294e41bb777f83f88578be" dependencies = [ "proc-macro2", "quote", @@ -536,9 +537,9 @@ [[package]] name = "serde_json" -version = "1.0.72" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0ffa0837f2dfa6fb90868c2b5468cad482e175f7dad97e7421951e663f2b527" +checksum = "9b7ce2b32a1aed03c558dc61a5cd328f15aff2dbc17daad8fb8af04d2100e15c" dependencies = [ "indexmap", "itoa", @@ -559,9 +560,9 @@ [[package]] name = "smallvec" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ecab6c735a6bb4139c0caafd0cc3635748bbb3acf4550e8138122099251f309" +checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83" [[package]] name = "static_assertions" @@ -577,32 +578,20 @@ [[package]] name = "syn" -version = "1.0.82" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8daf5dd0bb60cbd4137b1b587d2fc0ae729bc07cf01cd70b36a1ed5ade3b9d59" -dependencies = [ - "proc-macro2", - "quote", - "unicode-xid", -] - -[[package]] -name = "synstructure" -version = "0.12.6" +version = "1.0.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" +checksum = "0748dd251e24453cb8717f0354206b91557e4ec8703673a4b30208f2abaf1ebf" dependencies = [ "proc-macro2", "quote", - "syn", - "unicode-xid", + "unicode-ident", ] [[package]] name = "termcolor" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4" +checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" dependencies = [ "winapi-util", ] @@ -615,18 +604,18 @@ [[package]] name = "thiserror" -version = "1.0.30" +version = "1.0.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417" +checksum = "bd829fe32373d27f76265620b5309d0340cb8550f523c1dda251d6298069069a" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.30" +version = "1.0.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b" +checksum = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a" dependencies = [ "proc-macro2", "quote", @@ -634,22 +623,22 @@ ] [[package]] -name = "unicode-width" -version = "0.1.9" +name = "unicode-ident" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" +checksum = "d22af068fba1eb5edcb4aea19d382b2a3deb4c8f9d475c589b6ada9e0fd493ee" [[package]] -name = "unicode-xid" -version = "0.2.2" +name = "unicode-width" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" +checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" [[package]] name = "version_check" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "wasi" --- a/bindings/jsonnet/Cargo.toml +++ b/bindings/jsonnet/Cargo.toml @@ -10,7 +10,7 @@ [dependencies] jrsonnet-evaluator = { path = "../../crates/jrsonnet-evaluator", version = "0.4.2" } jrsonnet-parser = { path = "../../crates/jrsonnet-parser", version = "0.4.2" } -gcmodule = { git = "https://github.com/CertainLach/gcmodule", branch = "jrsonnet" } +jrsonnet-gcmodule = { version = "0.3.4" } [lib] crate-type = ["cdylib"] --- a/bindings/jsonnet/src/native.rs +++ b/bindings/jsonnet/src/native.rs @@ -3,7 +3,6 @@ os::raw::{c_char, c_int}, }; -use gcmodule::Cc; use jrsonnet_evaluator::{ error::{Error, LocError}, function::builtin::{BuiltinParam, NativeCallback, NativeCallbackHandler}, @@ -11,6 +10,7 @@ typed::Typed, IStr, State, Val, }; +use jrsonnet_gcmodule::Cc; type JsonnetNativeCallback = unsafe extern "C" fn( ctx: *const c_void, @@ -18,11 +18,11 @@ success: *mut c_int, ) -> *mut Val; -#[derive(gcmodule::Trace)] +#[derive(jrsonnet_gcmodule::Trace)] struct JsonnetNativeCallbackHandler { - #[skip_trace] + #[trace(skip)] ctx: *const c_void, - #[skip_trace] + #[trace(skip)] cb: JsonnetNativeCallback, } impl NativeCallbackHandler for JsonnetNativeCallbackHandler { --- a/bindings/jsonnet/src/val_make.rs +++ b/bindings/jsonnet/src/val_make.rs @@ -5,8 +5,8 @@ os::raw::{c_char, c_double, c_int}, }; -use gcmodule::Cc; use jrsonnet_evaluator::{val::ArrValue, ObjValue, State, Val}; +use jrsonnet_gcmodule::Cc; /// # Safety /// --- a/bindings/jsonnet/src/val_modify.rs +++ b/bindings/jsonnet/src/val_modify.rs @@ -4,8 +4,8 @@ use std::{ffi::CStr, os::raw::c_char}; -use gcmodule::Cc; use jrsonnet_evaluator::{val::ArrValue, State, Thunk, Val}; +use jrsonnet_gcmodule::Cc; /// # Safety /// --- a/cmds/jrsonnet/Cargo.toml +++ b/cmds/jrsonnet/Cargo.toml @@ -23,8 +23,9 @@ jrsonnet-evaluator = { path = "../../crates/jrsonnet-evaluator", version = "0.4.2" } jrsonnet-parser = { path = "../../crates/jrsonnet-parser", version = "0.4.2" } jrsonnet-cli = { path = "../../crates/jrsonnet-cli", version = "0.4.2" } +jrsonnet-gcmodule = { version = "0.3.4" } + mimallocator = { version = "0.1.3", optional = true } thiserror = "1.0" -gcmodule = { git = "https://github.com/CertainLach/gcmodule", branch = "jrsonnet" } clap = { version = "3.1", features = ["derive"] } clap_complete = { version = "3.1" } --- a/cmds/jrsonnet/src/main.rs +++ b/cmds/jrsonnet/src/main.rs @@ -115,7 +115,6 @@ } fn main_real(s: &State, opts: Opts) -> Result<(), Error> { - opts.gc.configure_global(); opts.general.configure(s)?; opts.manifest.configure(s)?; --- a/crates/jrsonnet-cli/Cargo.toml +++ b/crates/jrsonnet-cli/Cargo.toml @@ -14,6 +14,6 @@ "explaining-traces", ] } jrsonnet-parser = { path = "../../crates/jrsonnet-parser", version = "0.4.2" } -gcmodule = { git = "https://github.com/CertainLach/gcmodule", branch = "jrsonnet" } +jrsonnet-gcmodule = { version = "0.3.4" } clap = { version = "3.1", features = ["derive"] } --- a/crates/jrsonnet-cli/src/lib.rs +++ b/crates/jrsonnet-cli/src/lib.rs @@ -8,6 +8,7 @@ use clap::Parser; pub use ext::*; use jrsonnet_evaluator::{error::Result, FileImportResolver, State}; +use jrsonnet_gcmodule::with_thread_object_space; pub use manifest::*; pub use tla::*; pub use trace::*; @@ -111,15 +112,21 @@ gc_collect_before_printing_stats: bool, } impl GcOpts { - pub fn configure_global(&self) { - if !self.gc_collect_on_exit { - gcmodule::set_thread_collect_on_drop(false) - } + pub fn stats_printer(&self) -> (Option, Option) { + ( + self.gc_print_stats.then(|| GcStatsPrinter { + collect_before_printing_stats: self.gc_collect_before_printing_stats, + }), + (!self.gc_collect_on_exit).then(|| LeakSpace {}), + ) } - pub fn stats_printer(&self) -> Option { - self.gc_print_stats.then(|| GcStatsPrinter { - collect_before_printing_stats: self.gc_collect_before_printing_stats, - }) +} + +pub struct LeakSpace {} + +impl Drop for LeakSpace { + fn drop(&mut self) { + with_thread_object_space(|s| s.leak()) } } @@ -130,9 +137,9 @@ fn drop(&mut self) { eprintln!("=== GC STATS ==="); if self.collect_before_printing_stats { - let collected = gcmodule::collect_thread_cycles(); + let collected = jrsonnet_gcmodule::collect_thread_cycles(); eprintln!("Collected: {}", collected); } - eprintln!("Tracked: {}", gcmodule::count_thread_tracked()) + eprintln!("Tracked: {}", jrsonnet_gcmodule::count_thread_tracked()) } } --- a/crates/jrsonnet-evaluator/Cargo.toml +++ b/crates/jrsonnet-evaluator/Cargo.toml @@ -30,6 +30,8 @@ jrsonnet-stdlib = { path = "../jrsonnet-stdlib", version = "0.4.2" } jrsonnet-types = { path = "../jrsonnet-types", version = "0.4.2" } jrsonnet-macros = { path = "../jrsonnet-macros", version = "0.4.2" } +jrsonnet-gcmodule = { version = "0.3.4" } + pathdiff = "0.2.1" hashbrown = "0.12.1" static_assertions = "1.1.0" @@ -39,7 +41,6 @@ rustc-hash = "1.1" thiserror = "1.0" -gcmodule = { git = "https://github.com/CertainLach/gcmodule", branch = "jrsonnet" } serde = "1.0" serde_json = "1.0" --- a/crates/jrsonnet-evaluator/src/ctx.rs +++ b/crates/jrsonnet-evaluator/src/ctx.rs @@ -1,11 +1,10 @@ use std::fmt::Debug; -use gcmodule::{Cc, Trace}; +use jrsonnet_gcmodule::{Cc, Trace}; use jrsonnet_interner::IStr; use crate::{ - cc_ptr_eq, error::Error::*, gc::GcHashMap, map::LayeredHashMap, ObjValue, Pending, Result, - Thunk, Val, + error::Error::*, gc::GcHashMap, map::LayeredHashMap, ObjValue, Pending, Result, Thunk, Val, }; #[derive(Trace)] @@ -136,6 +135,6 @@ impl PartialEq for Context { fn eq(&self, other: &Self) -> bool { - cc_ptr_eq(&self.0, &other.0) + Cc::ptr_eq(&self.0, &other.0) } } --- a/crates/jrsonnet-evaluator/src/dynamic.rs +++ b/crates/jrsonnet-evaluator/src/dynamic.rs @@ -1,6 +1,6 @@ use std::cell::RefCell; -use gcmodule::{Cc, Trace}; +use jrsonnet_gcmodule::{Cc, Trace}; #[derive(Clone, Trace)] pub struct Pending(pub Cc>>); --- a/crates/jrsonnet-evaluator/src/error.rs +++ b/crates/jrsonnet-evaluator/src/error.rs @@ -1,6 +1,6 @@ use std::{fmt::Debug, path::PathBuf}; -use gcmodule::Trace; +use jrsonnet_gcmodule::Trace; use jrsonnet_interner::IStr; use jrsonnet_parser::{BinaryOpType, ExprLocation, Source, UnaryOpType}; use jrsonnet_types::ValType; @@ -125,7 +125,7 @@ ImportSyntaxError { path: Source, source_code: IStr, - #[skip_trace] + #[trace(skip)] error: Box, }, --- a/crates/jrsonnet-evaluator/src/evaluate/destructure.rs +++ b/crates/jrsonnet-evaluator/src/evaluate/destructure.rs @@ -1,4 +1,4 @@ -use gcmodule::Trace; +use jrsonnet_gcmodule::Trace; use jrsonnet_interner::IStr; use jrsonnet_parser::{BindSpec, Destruct, LocExpr, ParamsDesc}; --- a/crates/jrsonnet-evaluator/src/evaluate/mod.rs +++ b/crates/jrsonnet-evaluator/src/evaluate/mod.rs @@ -1,6 +1,6 @@ use std::{cmp::Ordering, rc::Rc}; -use gcmodule::{Cc, Trace}; +use jrsonnet_gcmodule::{Cc, Trace}; use jrsonnet_interner::IStr; use jrsonnet_parser::{ ArgsDesc, AssertStmt, BindSpec, CompSpec, Expr, FieldMember, FieldName, ForSpecData, @@ -151,7 +151,7 @@ value, }) => { #[derive(Trace)] - struct UnboundValue { + struct UnboundValue { uctx: B, value: LocExpr, name: IStr, @@ -201,7 +201,7 @@ .. }) => { #[derive(Trace)] - struct UnboundMethod { + struct UnboundMethod { uctx: B, value: LocExpr, params: ParamsDesc, @@ -247,7 +247,7 @@ Member::BindStmt(_) => {} Member::AssertStmt(stmt) => { #[derive(Trace)] - struct ObjectAssert { + struct ObjectAssert { uctx: B, assert: AssertStmt, } @@ -299,7 +299,7 @@ Val::Null => {} Val::Str(n) => { #[derive(Trace)] - struct UnboundValue { + struct UnboundValue { uctx: B, value: LocExpr, } --- a/crates/jrsonnet-evaluator/src/function/arglike.rs +++ b/crates/jrsonnet-evaluator/src/function/arglike.rs @@ -1,6 +1,6 @@ use std::collections::HashMap; -use gcmodule::Trace; +use jrsonnet_gcmodule::Trace; use jrsonnet_interner::IStr; use jrsonnet_parser::{ArgsDesc, LocExpr}; --- a/crates/jrsonnet-evaluator/src/function/builtin.rs +++ b/crates/jrsonnet-evaluator/src/function/builtin.rs @@ -1,6 +1,6 @@ use std::borrow::Cow; -use gcmodule::Trace; +use jrsonnet_gcmodule::Trace; use super::{arglike::ArgsLike, parse::parse_builtin_call, CallLocation}; use crate::{error::Result, gc::TraceBox, Context, State, Val}; --- a/crates/jrsonnet-evaluator/src/function/mod.rs +++ b/crates/jrsonnet-evaluator/src/function/mod.rs @@ -1,7 +1,7 @@ use std::fmt::Debug; pub use arglike::{ArgLike, ArgsLike, TlaArg}; -use gcmodule::{Cc, Trace}; +use jrsonnet_gcmodule::{Cc, Trace}; use jrsonnet_interner::IStr; pub use jrsonnet_macros::builtin; use jrsonnet_parser::{ExprLocation, LocExpr, ParamsDesc}; @@ -91,7 +91,7 @@ /// Plain function implemented in jsonnet Normal(Cc), /// Standard library function - StaticBuiltin(#[skip_trace] &'static dyn StaticBuiltin), + StaticBuiltin(#[trace(skip)] &'static dyn StaticBuiltin), /// User-provided function Builtin(Cc>), } --- a/crates/jrsonnet-evaluator/src/function/parse.rs +++ b/crates/jrsonnet-evaluator/src/function/parse.rs @@ -1,4 +1,4 @@ -use gcmodule::Trace; +use jrsonnet_gcmodule::Trace; use jrsonnet_interner::IStr; use jrsonnet_parser::{LocExpr, ParamsDesc}; --- a/crates/jrsonnet-evaluator/src/gc.rs +++ b/crates/jrsonnet-evaluator/src/gc.rs @@ -6,8 +6,8 @@ ops::{Deref, DerefMut}, }; -use gcmodule::{Trace, Tracer}; use hashbrown::HashMap; +use jrsonnet_gcmodule::{Trace, Tracer}; use rustc_hash::{FxHashSet, FxHasher}; /// Replacement for box, which assumes that the underlying type is [`Trace`] @@ -92,7 +92,7 @@ where V: Trace, { - fn trace(&self, tracer: &mut gcmodule::Tracer) { + fn trace(&self, tracer: &mut jrsonnet_gcmodule::Tracer) { for v in &self.0 { v.trace(tracer); } @@ -133,7 +133,7 @@ K: Trace, V: Trace, { - fn trace(&self, tracer: &mut gcmodule::Tracer) { + fn trace(&self, tracer: &mut jrsonnet_gcmodule::Tracer) { for (k, v) in &self.0 { k.trace(tracer); v.trace(tracer); --- a/crates/jrsonnet-evaluator/src/lib.rs +++ b/crates/jrsonnet-evaluator/src/lib.rs @@ -57,9 +57,9 @@ pub use evaluate::*; use function::{builtin::Builtin, CallLocation, TlaArg}; use gc::{GcHashMap, TraceBox}; -use gcmodule::{Cc, Trace, Weak}; use hashbrown::hash_map::RawEntryMut; pub use import::*; +use jrsonnet_gcmodule::{Cc, Trace}; use jrsonnet_interner::IBytes; pub use jrsonnet_interner::IStr; pub use jrsonnet_parser as parser; @@ -704,32 +704,4 @@ pub fn set_max_stack(&self, trace: usize) { self.settings_mut().max_stack = trace; } -} - -pub fn cc_ptr_eq(a: &Cc, b: &Cc) -> bool { - let a = a as &T; - let b = b as &T; - std::ptr::eq(a, b) -} - -fn weak_raw(a: Weak) -> *const () { - unsafe { std::mem::transmute(a) } -} -fn weak_ptr_eq(a: Weak, b: Weak) -> bool { - std::ptr::eq(weak_raw(a), weak_raw(b)) -} - -#[test] -fn weak_unsafe() { - let a = Cc::new(1); - let b = Cc::new(2); - - let aw1 = a.clone().downgrade(); - let aw2 = a.clone().downgrade(); - let aw3 = a.clone().downgrade(); - - let bw = b.clone().downgrade(); - - assert!(weak_ptr_eq(aw1, aw2)); - assert!(!weak_ptr_eq(aw3, bw)); } --- a/crates/jrsonnet-evaluator/src/map.rs +++ b/crates/jrsonnet-evaluator/src/map.rs @@ -1,10 +1,10 @@ -use gcmodule::{Cc, Trace}; +use jrsonnet_gcmodule::{Cc, Trace}; use jrsonnet_interner::IStr; use crate::{GcHashMap, Thunk, Val}; #[derive(Trace)] -#[force_tracking] +#[trace(tracking(force))] pub struct LayeredHashMapInternals { parent: Option, current: GcHashMap>, --- a/crates/jrsonnet-evaluator/src/obj.rs +++ b/crates/jrsonnet-evaluator/src/obj.rs @@ -5,18 +5,17 @@ ptr::addr_of, }; -use gcmodule::{Cc, Trace, Weak}; +use jrsonnet_gcmodule::{Cc, Trace, Weak}; use jrsonnet_interner::IStr; use jrsonnet_parser::{ExprLocation, Visibility}; use rustc_hash::FxHashMap; use crate::{ - cc_ptr_eq, error::{Error::*, LocError}, function::CallLocation, gc::{GcHashMap, GcHashSet, TraceBox}, operator::evaluate_add_op, - throw, weak_ptr_eq, weak_raw, LazyBinding, Result, State, Thunk, Unbound, Val, + throw, LazyBinding, Result, State, Thunk, Unbound, Val, }; #[cfg(not(feature = "exp-preserve-order"))] @@ -26,7 +25,7 @@ clippy::unused_self, )] - use gcmodule::Trace; + use jrsonnet_gcmodule::Trace; #[derive(Clone, Copy, Default, Debug, Trace)] pub struct FieldIndex; @@ -57,7 +56,7 @@ mod ordering { use std::cmp::Reverse; - use gcmodule::Trace; + use jrsonnet_gcmodule::Trace; #[derive(Clone, Copy, Default, Debug, Trace, PartialEq, Eq, PartialOrd, Ord)] pub struct FieldIndex(u32); @@ -122,7 +121,7 @@ #[allow(clippy::module_name_repetitions)] #[derive(Trace)] -#[force_tracking] +#[trace(tracking(force))] pub struct ObjValueInternals { sup: Option, this: Option, @@ -134,18 +133,20 @@ } #[derive(Clone, Trace)] -pub struct WeakObjValue(#[skip_trace] pub(crate) Weak); +pub struct WeakObjValue(#[trace(skip)] pub(crate) Weak); impl PartialEq for WeakObjValue { fn eq(&self, other: &Self) -> bool { - weak_ptr_eq(self.0.clone(), other.0.clone()) + Weak::ptr_eq(&self.0, &other.0) } } impl Eq for WeakObjValue {} impl Hash for WeakObjValue { fn hash(&self, hasher: &mut H) { - hasher.write_usize(weak_raw(self.0.clone()) as usize); + // Safety: usize is POD + let addr = unsafe { *std::ptr::addr_of!(self.0).cast() }; + hasher.write_usize(addr); } } @@ -454,7 +455,7 @@ } pub fn ptr_eq(a: &Self, b: &Self) -> bool { - cc_ptr_eq(&a.0, &b.0) + Cc::ptr_eq(&a.0, &b.0) } pub fn downgrade(self) -> WeakObjValue { WeakObjValue(self.0.downgrade()) @@ -463,7 +464,7 @@ impl PartialEq for ObjValue { fn eq(&self, other: &Self) -> bool { - cc_ptr_eq(&self.0, &other.0) + Cc::ptr_eq(&self.0, &other.0) } } --- a/crates/jrsonnet-evaluator/src/stdlib/format.rs +++ b/crates/jrsonnet-evaluator/src/stdlib/format.rs @@ -1,7 +1,7 @@ //! faster std.format impl #![allow(clippy::too_many_arguments)] -use gcmodule::Trace; +use jrsonnet_gcmodule::Trace; use jrsonnet_interner::IStr; use jrsonnet_types::ValType; use thiserror::Error; --- a/crates/jrsonnet-evaluator/src/stdlib/mod.rs +++ b/crates/jrsonnet-evaluator/src/stdlib/mod.rs @@ -4,7 +4,7 @@ use std::collections::HashMap; use format::{format_arr, format_obj}; -use gcmodule::Cc; +use jrsonnet_gcmodule::Cc; use jrsonnet_interner::{IBytes, IStr}; use serde::Deserialize; use serde_yaml::DeserializingQuirks; --- a/crates/jrsonnet-evaluator/src/stdlib/sort.rs +++ b/crates/jrsonnet-evaluator/src/stdlib/sort.rs @@ -1,4 +1,4 @@ -use gcmodule::{Cc, Trace}; +use jrsonnet_gcmodule::{Cc, Trace}; use crate::{ error::{Error, LocError, Result}, --- a/crates/jrsonnet-evaluator/src/typed/conversions.rs +++ b/crates/jrsonnet-evaluator/src/typed/conversions.rs @@ -1,6 +1,6 @@ use std::ops::Deref; -use gcmodule::Cc; +use jrsonnet_gcmodule::Cc; use jrsonnet_interner::{IBytes, IStr}; pub use jrsonnet_macros::Typed; use jrsonnet_types::{ComplexValType, ValType}; --- a/crates/jrsonnet-evaluator/src/typed/mod.rs +++ b/crates/jrsonnet-evaluator/src/typed/mod.rs @@ -2,7 +2,7 @@ mod conversions; pub use conversions::*; -use gcmodule::Trace; +use jrsonnet_gcmodule::Trace; pub use jrsonnet_types::{ComplexValType, ValType}; use thiserror::Error; @@ -16,7 +16,7 @@ #[error("expected {0}, got {1}")] ExpectedGot(ComplexValType, ValType), #[error("missing property {0} from {1}")] - MissingProperty(#[skip_trace] Rc, ComplexValType), + MissingProperty(#[trace(skip)] Rc, ComplexValType), #[error("every failed from {0}:\n{1}")] UnionFailed(ComplexValType, TypeLocErrorList), #[error( @@ -119,7 +119,7 @@ #[derive(Clone, Debug, Trace)] enum ValuePathItem { - Field(#[skip_trace] Rc), + Field(#[trace(skip)] Rc), Index(u64), } impl Display for ValuePathItem { --- a/crates/jrsonnet-evaluator/src/val.rs +++ b/crates/jrsonnet-evaluator/src/val.rs @@ -1,11 +1,10 @@ use std::{cell::RefCell, fmt::Debug, rc::Rc}; -use gcmodule::{Cc, Trace}; +use jrsonnet_gcmodule::{Cc, Trace}; use jrsonnet_interner::{IBytes, IStr}; use jrsonnet_types::ValType; use crate::{ - cc_ptr_eq, error::{Error::*, LocError}, function::FuncVal, gc::{GcHashMap, TraceBox}, @@ -21,7 +20,7 @@ } #[derive(Trace)] -enum ThunkInner { +enum ThunkInner { Computed(T), Errored(LocError), Waiting(TraceBox>), @@ -30,7 +29,7 @@ #[allow(clippy::module_name_repetitions)] #[derive(Clone, Trace)] -pub struct Thunk(Cc>>); +pub struct Thunk(Cc>>); impl Thunk where @@ -78,6 +77,7 @@ pub struct CachedUnbound where I: Unbound, + T: Trace, { cache: Cc>>, value: I, @@ -113,14 +113,14 @@ } } -impl Debug for Thunk { +impl Debug for Thunk { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { write!(f, "Lazy") } } -impl PartialEq for Thunk { +impl PartialEq for Thunk { fn eq(&self, other: &Self) -> bool { - cc_ptr_eq(&self.0, &other.0) + Cc::ptr_eq(&self.0, &other.0) } } @@ -185,9 +185,10 @@ } #[derive(Debug, Clone, Trace)] -#[force_tracking] +// may contrain other ArrValue +#[trace(tracking(force))] pub enum ArrValue { - Bytes(#[skip_trace] IBytes), + Bytes(#[trace(skip)] IBytes), Lazy(Cc>>), Eager(Cc>), Extended(Box<(Self, Self)>), @@ -434,8 +435,8 @@ pub fn ptr_eq(a: &Self, b: &Self) -> bool { match (a, b) { - (Self::Lazy(a), Self::Lazy(b)) => cc_ptr_eq(a, b), - (Self::Eager(a), Self::Eager(b)) => cc_ptr_eq(a, b), + (Self::Lazy(a), Self::Lazy(b)) => Cc::ptr_eq(a, b), + (Self::Eager(a), Self::Eager(b)) => Cc::ptr_eq(a, b), _ => false, } } --- a/crates/jrsonnet-evaluator/tests/builtin.rs +++ b/crates/jrsonnet-evaluator/tests/builtin.rs @@ -1,6 +1,5 @@ mod common; -use gcmodule::Cc; use jrsonnet_evaluator::{ error::Result, function::{builtin, builtin::Builtin, CallLocation, FuncVal}, @@ -8,6 +7,7 @@ typed::Typed, State, Val, }; +use jrsonnet_gcmodule::Cc; #[builtin] fn a() -> Result { --- a/crates/jrsonnet-interner/Cargo.toml +++ b/crates/jrsonnet-interner/Cargo.toml @@ -11,7 +11,8 @@ serde = ["dep:serde"] [dependencies] +jrsonnet-gcmodule = { version = "0.3.4" } + serde = { version = "1.0", optional = true } rustc-hash = "1.1" -gcmodule = { git = "https://github.com/CertainLach/gcmodule", branch = "jrsonnet" } hashbrown = { version = "0.12.1", features = ["inline-more"] } --- a/crates/jrsonnet-interner/src/lib.rs +++ b/crates/jrsonnet-interner/src/lib.rs @@ -13,8 +13,8 @@ str, }; -use gcmodule::Trace; use hashbrown::HashMap; +use jrsonnet_gcmodule::Trace; use rustc_hash::FxHasher; mod inner; --- a/crates/jrsonnet-macros/src/lib.rs +++ b/crates/jrsonnet-macros/src/lib.rs @@ -342,7 +342,7 @@ #fun #[doc(hidden)] #[allow(non_camel_case_types)] - #[derive(Clone, gcmodule::Trace #static_derive_copy)] + #[derive(Clone, jrsonnet_gcmodule::Trace #static_derive_copy)] #vis struct #name { #(#fields)* } --- a/crates/jrsonnet-parser/Cargo.toml +++ b/crates/jrsonnet-parser/Cargo.toml @@ -11,12 +11,13 @@ [dependencies] jrsonnet-interner = { path = "../jrsonnet-interner", version = "0.4.2" } +jrsonnet-gcmodule = { version = "0.3.4" } + static_assertions = "1.1.0" peg = "0.8.0" serde = { version = "1.0", features = ["derive", "rc"], optional = true } -gcmodule = { git = "https://github.com/CertainLach/gcmodule", branch = "jrsonnet" } [dev-dependencies] jrsonnet-stdlib = { path = "../jrsonnet-stdlib", version = "0.4.2" } --- a/crates/jrsonnet-parser/src/expr.rs +++ b/crates/jrsonnet-parser/src/expr.rs @@ -4,7 +4,7 @@ rc::Rc, }; -use gcmodule::Trace; +use jrsonnet_gcmodule::Trace; use jrsonnet_interner::IStr; #[cfg(feature = "serde")] use serde::{Deserialize, Serialize}; @@ -359,7 +359,7 @@ /// file, begin offset, end offset #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[derive(Clone, PartialEq, Eq, Trace)] -#[skip_trace] +#[trace(skip)] #[repr(C)] pub struct ExprLocation(pub Source, pub u32, pub u32); impl ExprLocation { --- a/crates/jrsonnet-parser/src/source.rs +++ b/crates/jrsonnet-parser/src/source.rs @@ -5,7 +5,7 @@ rc::Rc, }; -use gcmodule::{Trace, Tracer}; +use jrsonnet_gcmodule::{Trace, Tracer}; #[cfg(feature = "serde")] use serde::{Deserialize, Serialize}; --- a/crates/jrsonnet-types/Cargo.toml +++ b/crates/jrsonnet-types/Cargo.toml @@ -7,5 +7,6 @@ edition = "2021" [dependencies] +jrsonnet-gcmodule = { version = "0.3.4" } + peg = "0.8.0" -gcmodule = { git = "https://github.com/CertainLach/gcmodule", branch = "jrsonnet" } --- a/crates/jrsonnet-types/src/lib.rs +++ b/crates/jrsonnet-types/src/lib.rs @@ -2,7 +2,7 @@ use std::fmt::Display; -use gcmodule::Trace; +use jrsonnet_gcmodule::Trace; #[macro_export] macro_rules! ty { @@ -115,7 +115,7 @@ } #[derive(Debug, Clone, PartialEq, Trace)] -#[skip_trace] +#[trace(skip)] pub enum ComplexValType { Any, Char, -- gitstuff