diff --git a/Cargo.lock b/Cargo.lock index 5300f749d4..20b29a9911 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -409,15 +409,6 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" -[[package]] -name = "cmake" -version = "0.1.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130" -dependencies = [ - "cc", -] - [[package]] name = "color_quant" version = "1.1.0" @@ -786,15 +777,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "itertools" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f56a2d0bc861f9165be4eb3442afd3c236d8a98afd426f65d92324ae1091a484" -dependencies = [ - "either", -] - [[package]] name = "itertools" version = "0.10.5" @@ -1012,6 +994,16 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0676bb32a98c1a483ce53e500a81ad9c3d5b3f7c920c28c24e9cb0980d0b5bc8" +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + [[package]] name = "num-bigint" version = "0.4.3" @@ -1096,6 +1088,12 @@ version = "11.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + [[package]] name = "paste" version = "1.0.13" @@ -1114,6 +1112,12 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" +[[package]] +name = "pin-project-lite" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" + [[package]] name = "pkg-config" version = "0.3.27" @@ -1214,6 +1218,26 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "profiling" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f89dff0959d98c9758c88826cc002e2c3d0b9dfac4139711d1f30de442f1139b" +dependencies = [ + "profiling-procmacros", + "tracing", +] + +[[package]] +name = "profiling-procmacros" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb156a45b6b9fe8027497422179fb65afc84d36707a7ca98297bf06bccb8d43f" +dependencies = [ + "quote", + "syn 2.0.39", +] + [[package]] name = "quickcheck" version = "1.0.3" @@ -1316,11 +1340,11 @@ dependencies = [ "once_cell", "paste", "pretty_assertions", + "profiling", "quickcheck", "quickcheck_macros", "rand", "rand_chacha", - "rust_hawktracer", "rustc_version", "scan_fmt", "semver", @@ -1331,6 +1355,9 @@ dependencies = [ "system-deps", "thiserror", "toml", + "tracing", + "tracing-chrome", + "tracing-subscriber", "v_frame", "wasm-bindgen", "y4m", @@ -1402,29 +1429,12 @@ name = "rust_hawktracer_normal_macro" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a570059949e1dcdc6f35228fa389f54c2c84dfe0c94c05022baacd56eacd2e9" -dependencies = [ - "rust_hawktracer_sys", -] [[package]] name = "rust_hawktracer_proc_macro" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb626abdbed5e93f031baae60d72032f56bc964e11ac2ff65f2ba3ed98d6d3e1" -dependencies = [ - "rust_hawktracer_sys", -] - -[[package]] -name = "rust_hawktracer_sys" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67cc853071df5815fa6c087452d1b533f7c884c836b8a7393b4ff88090cc4c95" -dependencies = [ - "cmake", - "itertools 0.8.2", - "pkg-config", -] [[package]] name = "rustc-demangle" @@ -1559,6 +1569,15 @@ dependencies = [ "serde", ] +[[package]] +name = "sharded-slab" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +dependencies = [ + "lazy_static", +] + [[package]] name = "shlex" version = "1.1.0" @@ -1682,6 +1701,16 @@ dependencies = [ "syn 2.0.25", ] +[[package]] +name = "thread_local" +version = "1.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +dependencies = [ + "cfg-if", + "once_cell", +] + [[package]] name = "tinytemplate" version = "1.2.1" @@ -1741,6 +1770,74 @@ dependencies = [ "winnow", ] +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "tracing-chrome" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "496b3cd5447f7ff527bbbf19b071ad542a000adf297d4127078b4dfdb931f41a" +dependencies = [ + "serde_json", + "tracing-core", + "tracing-subscriber", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", + "valuable", +] + +[[package]] +name = "tracing-log" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" +dependencies = [ + "nu-ansi-term", + "sharded-slab", + "smallvec", + "thread_local", + "tracing-core", + "tracing-log", +] + [[package]] name = "unicode-bidi" version = "0.3.13" @@ -1799,6 +1896,12 @@ dependencies = [ "serde", ] +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + [[package]] name = "vcpkg" version = "0.2.15" diff --git a/Cargo.toml b/Cargo.toml index 9a1aa5fce1..adc981aa8c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -49,7 +49,12 @@ desync_finder = ["backtrace"] bench = [] check_asm = [] capi = ["scan_fmt"] -tracing = ["rust_hawktracer/profiling_enabled", "rust_hawktracer/pkg_config"] +tracing = [ + "profiling/profile-with-tracing", + "tracing-subscriber", + "tracing-chrome", + "dep:tracing" +] scenechange = [] serialize = ["serde", "toml", "v_frame/serialize", "serde-big-array"] wasm = ["wasm-bindgen"] @@ -102,12 +107,15 @@ fern = { version = "0.6", optional = true } itertools = "0.11" simd_helpers = "0.1" wasm-bindgen = { version = "0.2.87", optional = true } -rust_hawktracer = "0.7.0" nom = { version = "7.1.3", optional = true } new_debug_unreachable = "1.0.4" once_cell = "1.18.0" av1-grain = { version = "0.2.2", features = ["serialize"] } serde-big-array = { version = "0.5.1", optional = true } +profiling = { version = "1" } +tracing-subscriber = { version = "0.3.18", optional = true } +tracing-chrome = { version = "0.7.1", optional = true } +tracing = { version = "0.1.40", optional = true } [dependencies.image] version = "0.24.6"