diff --git a/Cargo.lock b/Cargo.lock index f028541ca..d22ad66e0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -71,7 +71,7 @@ dependencies = [ "measureme 10.1.3", "measureme 12.0.3", "memchr", - "rustc-hash", + "rustc-hash 1.1.0", "serde", ] @@ -184,6 +184,26 @@ dependencies = [ "serde_json", ] +[[package]] +name = "bindgen" +version = "0.72.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "993776b509cfb49c750f11b8f07a46fa23e0a1386ffc01fb1e7d343efc387895" +dependencies = [ + "bitflags 2.10.0", + "cexpr", + "clang-sys", + "itertools 0.13.0", + "log", + "prettyplease", + "proc-macro2", + "quote", + "regex", + "rustc-hash 2.1.2", + "shlex", + "syn", +] + [[package]] name = "bitflags" version = "1.3.2" @@ -320,11 +340,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a0aeaff4ff1a90589618835a598e545176939b97874f7abc7851caa0618f203" dependencies = [ "find-msvc-tools", - "jobserver", - "libc", "shlex", ] +[[package]] +name = "cexpr" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" +dependencies = [ + "nom", +] + [[package]] name = "cfg-if" version = "1.0.0" @@ -346,6 +373,17 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "clang-sys" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" +dependencies = [ + "glob", + "libc", + "libloading", +] + [[package]] name = "clap" version = "4.1.14" @@ -494,11 +532,13 @@ dependencies = [ [[package]] name = "crabgrind" -version = "0.1.10" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e174279a2a6598ba9a1fec494ebb4172916b95e69d7d2396598c6a7b850d048" +checksum = "370855733cbddd025d0cb602df6f4cf898310921a3dcc4244cc3d1d8b3f2a3e4" dependencies = [ + "bindgen", "cc", + "pkg-config", ] [[package]] @@ -666,7 +706,7 @@ checksum = "8907b810935b1fc70e90f415d88e5e3fb1fc0d17058c7da49d5e294eab89decf" dependencies = [ "measureme 10.1.3", "memchr", - "rustc-hash", + "rustc-hash 1.1.0", "serde", "serde_json", ] @@ -679,7 +719,7 @@ checksum = "ecd00d8cf813abee38134c06d9164d1b82f75158c0dbfdb1fde429dee1e2ce9d" dependencies = [ "measureme 12.0.3", "memchr", - "rustc-hash", + "rustc-hash 1.1.0", "serde", "serde_json", ] @@ -1011,6 +1051,12 @@ dependencies = [ "wasi 0.14.2+wasi-0.2.4", ] +[[package]] +name = "glob" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280" + [[package]] name = "globset" version = "0.4.10" @@ -1675,6 +1721,16 @@ version = "0.2.179" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c5a2d376baa530d1238d133232d15e239abad80d05838b4b59354e5268af431f" +[[package]] +name = "libloading" +version = "0.8.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7c4b02199fee7c5d21a5ae7d8cfa79a6ef5bb2fc834d6e9058e89c825efdc55" +dependencies = [ + "cfg-if", + "windows-link", +] + [[package]] name = "libm" version = "0.2.6" @@ -1777,7 +1833,7 @@ dependencies = [ "memmap2", "parking_lot", "perf-event-open-sys 3.0.0", - "rustc-hash", + "rustc-hash 1.1.0", "smallvec", ] @@ -1791,7 +1847,7 @@ dependencies = [ "memmap2", "parking_lot", "perf-event-open-sys 3.0.0", - "rustc-hash", + "rustc-hash 1.1.0", "smallvec", ] @@ -2226,6 +2282,16 @@ version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +[[package]] +name = "prettyplease" +version = "0.2.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff24dfcda44452b9816fff4cd4227e1bb73ff5a2f1bc1105aa92fb8565ce44d2" +dependencies = [ + "proc-macro2", + "syn", +] + [[package]] name = "proc-macro-error-attr2" version = "2.0.0" @@ -2654,6 +2720,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" +[[package]] +name = "rustc-hash" +version = "2.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94300abf3f1ae2e2b8ffb7b58043de3d399c73fa6f4b73826402a5c457614dbe" + [[package]] name = "rustix" version = "0.38.44" diff --git a/collector/benchlib/Cargo.toml b/collector/benchlib/Cargo.toml index a7c2221ba..7c487d962 100644 --- a/collector/benchlib/Cargo.toml +++ b/collector/benchlib/Cargo.toml @@ -16,7 +16,7 @@ serde_json = { workspace = true } libc = "0.2" flate2 = { version = "1", optional = true } -crabgrind = { version = "0.1.10", optional = true } +crabgrind = { version = "0.2.0", optional = true } [target.'cfg(target_os = "linux")'.dependencies] perf-event = "0.4.9"