Bug 1716518 - Upgrade profiling to v1.0.2. r=emilio

Differential Revision: https://phabricator.services.mozilla.com/D117838
This commit is contained in:
Mike Hommey 2021-06-15 22:17:28 +00:00
parent b49cfeb2e9
commit e8574884ad
6 changed files with 16 additions and 16 deletions

4
Cargo.lock generated
View File

@ -3955,9 +3955,9 @@ dependencies = [
[[package]]
name = "profiling"
version = "1.0.1"
version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c3a66d5e88679f2720126c11ee29da07a08f094eac52306b066edd7d393752d6"
checksum = "0a7c000c0ce9d9bb94c0fbacdf20e5087fbe652c556ffb2c9387d980e17d51fb"
[[package]]
name = "prost"

View File

@ -1 +1 @@
{"files":{"CHANGELOG.md":"f51e0f29869f9a19db8c84c65a114eaff3815f1fb391f2269328c2b0ad6f439e","Cargo.lock":"228e7393349138ce6d02631e993b658f5af511e7c6e08cf8aa72d9fb1b332d82","Cargo.toml":"af988b26a32698c53ab0e31e75d977346add7ae4b0b526672085a3cb534b7497","LICENSE-APACHE":"10d30a673cd5e9349bdc02aeb48f14b3386d27d0da32df8f0a555d4aa16aa551","LICENSE-MIT":"c8167fdeeed46d3f244d3f85c5bf998ce889343691c32be2c61a8bc4b5c08333","README.md":"d688bee6ba297331fbf12fdd2f7c0d4fb3465a5e81d9a47b6267ee019200e8e9","deny.toml":"b934c6446590feb984c68ddde5ec871ea3c2605586500d8a895b856f2158deb6","examples/puffin/NotoSans-Medium.ttf":"a0cf3e73ac27bff9a4c22f2807c84e1eb3d0740134e84f5455b0a39c14a76e11","examples/puffin/imgui_support.rs":"aa00824f2395b426d337df3b00ac94339237a7083d4ba498aa4b9b1e0f920165","examples/puffin/puffin.rs":"8ad5e4b37cc0c846287026dbd7523f65b5076dac12725f98566b20cddb29cba9","examples/puffin/renderer.rs":"8611148a8f4eadd93112248b8029e6ee6d0f4e2d1312ddba3c18611c6417a38e","examples/puffin/shaders/compile_shaders.sh":"469d31610eb329b8d3dfb75b507f7dde309b8fb3d920794a7bfef47225843b84","examples/puffin/shaders/glsl/debug.frag":"e4a99b94f6d42aaf55b456e0afff41d3e0cf2e1217b9fa62a62d61f0b8d6ea4a","examples/puffin/shaders/glsl/debug.glsl":"e382ab582e1cc23d8f930f747856f3e264d1f63252e75e63feb37ba7cebb19b9","examples/puffin/shaders/glsl/debug.vert":"4a08d77df2f1093b25b10bae91404ca2215a2fbcb5874655073bc6610eec993a","examples/puffin/shaders/glsl/imgui.frag":"708cbf92892ff47129619fa4a1b49d8d92fd25c334ca1db297abdc3ff856bf75","examples/puffin/shaders/glsl/imgui.glsl":"f820afd23488f9f8923dc88d441fed7a8e8672167a478dde9c8da17ebe480f3a","examples/puffin/shaders/glsl/imgui.vert":"da01186c7a11792900e83288c1afbada7ecb880f72d119b0ae0b4fb96f1977ba","examples/puffin/shaders/out/debug.frag.cookedshaderpackage":"dafc932c79b08635aeeaa19afe659bed977b830aaaf9b1064214f9b6a3aeb82f","examples/puffin/shaders/out/debug.frag.metal":"7b65c0d5c8c5b9d3fa548b903eb79c217bf3f2edc9dbfd9bf16eb7af21c9cf7f","examples/puffin/shaders/out/debug.frag.spv":"e5b04a0e7688141e0fc8183b06a11ed71e55872e959f1b0f223a706776d65d0c","examples/puffin/shaders/out/debug.vert.cookedshaderpackage":"937348362eac750a2c47f1ef51ac450e95b2c07a458ac79bff6f9192b949f4c8","examples/puffin/shaders/out/debug.vert.metal":"00927df96045f93d2567f51d3078d86fafdd25e32d26815cd9ea29919eb7c66e","examples/puffin/shaders/out/debug.vert.spv":"587ee6f2f7ceec9eda19143accb17cc82a6174f43a7af78482d725ab5fcc3d32","examples/puffin/shaders/out/imgui.frag.cookedshaderpackage":"874a1a62fbd7eb789a7a3f5f17999fe8458322638dfe8331549dff55c7a93994","examples/puffin/shaders/out/imgui.frag.metal":"213cee127005db71b091249257d4363a5ace0b0871ea5107701491d386109899","examples/puffin/shaders/out/imgui.frag.spv":"1732a8debde7c60b17e2fc71eda5ce8fd8e53e8aa62202457e32be84dac9c111","examples/puffin/shaders/out/imgui.vert.cookedshaderpackage":"6d3a61514aadd55f4d2bd06b75650c0f2097c1627addbbb44bfa650f5fc439d5","examples/puffin/shaders/out/imgui.vert.metal":"92bf7b0b224420790d9e19b9de7aaa108697b09cb7fc2d6721c25f0fef4ca518","examples/puffin/shaders/out/imgui.vert.spv":"6677d81ef23ebaf8d140f749cd1b8ec9ec4089a6a2a2f93825e0b6d9d170b2cc","examples/simple.rs":"30bfbbd3c2af76e0284ec1e693cdcf19d8916ac0edabe08d85b2116c8e59c546","rustfmt.toml":"df025a0d166890f7b73df8596d0135a441d20311c9251e39df90e552675cebf3","screenshots/optick-small.png":"f7e7aacf4abb9c33be981104b2cb513990a70a1330b558a93fffce41e9e3a4d5","screenshots/optick.jpeg":"21eba8cc720f162b68bca2b04cc2de4e503df1d8391629cf2b119c8d0703063d","screenshots/superluminal-small.png":"2a0454927d791c18e581185f28e18ae3b7c58aeaa6ebcc624a4bc1e372e78b0d","screenshots/superluminal.jpeg":"cc2e35922f0663aa8e3cdb6f77593ee98692567c0b37a1b4f839fa5973eb600b","screenshots/tracing.png":"db48a29de2b848ca39ff70f7adcc777e7c098867fb923f0903a0eba2305b1eee","screenshots/tracy-small.png":"05ad7d07ca7a45605df5c176a7963237dc7ee4b7360f04474dcb700ca965dbb0","screenshots/tracy.jpeg":"011554c1da51ceb6262b17591a659464172396f270f2476535163509e2c919eb","src/empty_impl.rs":"341753cbc92275dc45184c22d60b5192854f35d6c57fdcd68b4ba17a6df59a27","src/lib.rs":"33fa9f148a2f80410ca71fad0b6ab1587c698f318175dfb0015aca9075e75694","src/optick_impl.rs":"167d92d27ac5c0e29b022f93c64d1d3b0e08db5bf0282f8874df465ab2fbe350","src/puffin_impl.rs":"70423e2e348ea0539b253841ad0ce594dd814f60d02ca5f8413a492a8f5cf0ec","src/superluminal_impl.rs":"9bf236c5435147b090cdb1e706f0480639590c6ca1a08ce795c9bcb714a7f1f8","src/tracing_impl.rs":"578d74ff824de5a32eb9eddf0048eaa32564dd72dfe546809be972654d4647a2","src/tracy_impl.rs":"9a6bb2b880dc3a79db8f8e66b797f799cead5ff0f6a3f2002e6321e53e63a07a","src/type_check_impl.rs":"daf88bb080b6d68e38206667a3d725948a3c836a0c0577d09354bde1e4213920"},"package":"c3a66d5e88679f2720126c11ee29da07a08f094eac52306b066edd7d393752d6"}
{"files":{"CHANGELOG.md":"f51e0f29869f9a19db8c84c65a114eaff3815f1fb391f2269328c2b0ad6f439e","Cargo.lock":"35332957d477595735c0d32ae184327bcb3bfcced0b58c451f367f2025b3d6ea","Cargo.toml":"eae8ced983df9d1e137f1b050f33cf97244ea910201df85d94b68eb644bfc9f4","LICENSE-APACHE":"10d30a673cd5e9349bdc02aeb48f14b3386d27d0da32df8f0a555d4aa16aa551","LICENSE-MIT":"c8167fdeeed46d3f244d3f85c5bf998ce889343691c32be2c61a8bc4b5c08333","README.md":"d688bee6ba297331fbf12fdd2f7c0d4fb3465a5e81d9a47b6267ee019200e8e9","deny.toml":"b934c6446590feb984c68ddde5ec871ea3c2605586500d8a895b856f2158deb6","examples/puffin/NotoSans-Medium.ttf":"a0cf3e73ac27bff9a4c22f2807c84e1eb3d0740134e84f5455b0a39c14a76e11","examples/puffin/imgui_support.rs":"aa00824f2395b426d337df3b00ac94339237a7083d4ba498aa4b9b1e0f920165","examples/puffin/puffin.rs":"8ad5e4b37cc0c846287026dbd7523f65b5076dac12725f98566b20cddb29cba9","examples/puffin/renderer.rs":"3c5feca1a49932af6bd62887bdf29ac5ae8c45cf5c946653f060164cd39386f8","examples/puffin/shaders/compile_shaders.sh":"469d31610eb329b8d3dfb75b507f7dde309b8fb3d920794a7bfef47225843b84","examples/puffin/shaders/glsl/debug.frag":"e4a99b94f6d42aaf55b456e0afff41d3e0cf2e1217b9fa62a62d61f0b8d6ea4a","examples/puffin/shaders/glsl/debug.glsl":"e382ab582e1cc23d8f930f747856f3e264d1f63252e75e63feb37ba7cebb19b9","examples/puffin/shaders/glsl/debug.vert":"4a08d77df2f1093b25b10bae91404ca2215a2fbcb5874655073bc6610eec993a","examples/puffin/shaders/glsl/imgui.frag":"708cbf92892ff47129619fa4a1b49d8d92fd25c334ca1db297abdc3ff856bf75","examples/puffin/shaders/glsl/imgui.glsl":"f820afd23488f9f8923dc88d441fed7a8e8672167a478dde9c8da17ebe480f3a","examples/puffin/shaders/glsl/imgui.vert":"da01186c7a11792900e83288c1afbada7ecb880f72d119b0ae0b4fb96f1977ba","examples/puffin/shaders/out/debug.frag.cookedshaderpackage":"dafc932c79b08635aeeaa19afe659bed977b830aaaf9b1064214f9b6a3aeb82f","examples/puffin/shaders/out/debug.frag.metal":"7b65c0d5c8c5b9d3fa548b903eb79c217bf3f2edc9dbfd9bf16eb7af21c9cf7f","examples/puffin/shaders/out/debug.frag.spv":"e5b04a0e7688141e0fc8183b06a11ed71e55872e959f1b0f223a706776d65d0c","examples/puffin/shaders/out/debug.vert.cookedshaderpackage":"937348362eac750a2c47f1ef51ac450e95b2c07a458ac79bff6f9192b949f4c8","examples/puffin/shaders/out/debug.vert.metal":"00927df96045f93d2567f51d3078d86fafdd25e32d26815cd9ea29919eb7c66e","examples/puffin/shaders/out/debug.vert.spv":"587ee6f2f7ceec9eda19143accb17cc82a6174f43a7af78482d725ab5fcc3d32","examples/puffin/shaders/out/imgui.frag.cookedshaderpackage":"874a1a62fbd7eb789a7a3f5f17999fe8458322638dfe8331549dff55c7a93994","examples/puffin/shaders/out/imgui.frag.metal":"213cee127005db71b091249257d4363a5ace0b0871ea5107701491d386109899","examples/puffin/shaders/out/imgui.frag.spv":"1732a8debde7c60b17e2fc71eda5ce8fd8e53e8aa62202457e32be84dac9c111","examples/puffin/shaders/out/imgui.vert.cookedshaderpackage":"6d3a61514aadd55f4d2bd06b75650c0f2097c1627addbbb44bfa650f5fc439d5","examples/puffin/shaders/out/imgui.vert.metal":"92bf7b0b224420790d9e19b9de7aaa108697b09cb7fc2d6721c25f0fef4ca518","examples/puffin/shaders/out/imgui.vert.spv":"6677d81ef23ebaf8d140f749cd1b8ec9ec4089a6a2a2f93825e0b6d9d170b2cc","examples/simple.rs":"30bfbbd3c2af76e0284ec1e693cdcf19d8916ac0edabe08d85b2116c8e59c546","rustfmt.toml":"df025a0d166890f7b73df8596d0135a441d20311c9251e39df90e552675cebf3","screenshots/optick-small.png":"f7e7aacf4abb9c33be981104b2cb513990a70a1330b558a93fffce41e9e3a4d5","screenshots/optick.jpeg":"21eba8cc720f162b68bca2b04cc2de4e503df1d8391629cf2b119c8d0703063d","screenshots/superluminal-small.png":"2a0454927d791c18e581185f28e18ae3b7c58aeaa6ebcc624a4bc1e372e78b0d","screenshots/superluminal.jpeg":"cc2e35922f0663aa8e3cdb6f77593ee98692567c0b37a1b4f839fa5973eb600b","screenshots/tracing.png":"db48a29de2b848ca39ff70f7adcc777e7c098867fb923f0903a0eba2305b1eee","screenshots/tracy-small.png":"05ad7d07ca7a45605df5c176a7963237dc7ee4b7360f04474dcb700ca965dbb0","screenshots/tracy.jpeg":"011554c1da51ceb6262b17591a659464172396f270f2476535163509e2c919eb","src/empty_impl.rs":"341753cbc92275dc45184c22d60b5192854f35d6c57fdcd68b4ba17a6df59a27","src/lib.rs":"33fa9f148a2f80410ca71fad0b6ab1587c698f318175dfb0015aca9075e75694","src/optick_impl.rs":"167d92d27ac5c0e29b022f93c64d1d3b0e08db5bf0282f8874df465ab2fbe350","src/puffin_impl.rs":"70423e2e348ea0539b253841ad0ce594dd814f60d02ca5f8413a492a8f5cf0ec","src/superluminal_impl.rs":"9bf236c5435147b090cdb1e706f0480639590c6ca1a08ce795c9bcb714a7f1f8","src/tracing_impl.rs":"92bdbd9fc760d258287df13f301f999f678f9ef742c599f7e71b668746743119","src/tracy_impl.rs":"9a6bb2b880dc3a79db8f8e66b797f799cead5ff0f6a3f2002e6321e53e63a07a","src/type_check_impl.rs":"daf88bb080b6d68e38206667a3d725948a3c836a0c0577d09354bde1e4213920"},"package":"0a7c000c0ce9d9bb94c0fbacdf20e5087fbe652c556ffb2c9387d980e17d51fb"}

View File

@ -889,7 +889,7 @@ dependencies = [
[[package]]
name = "profiling"
version = "1.0.1"
version = "1.0.2"
dependencies = [
"bincode",
"env_logger",
@ -899,7 +899,7 @@ dependencies = [
"lazy_static",
"log",
"optick",
"profiling-procmacros 1.0.1",
"profiling-procmacros 1.0.2",
"puffin",
"puffin-imgui",
"rafx",
@ -923,9 +923,9 @@ dependencies = [
[[package]]
name = "profiling-procmacros"
version = "1.0.1"
version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9b83296b4ea7c60800e0832617bb9d274e4f5928abd08acc5a6ae8be0fb15969"
checksum = "466a51c03efbf023203c8d30ea41eaae0b08d9d3b045db8ee12db88898a31cb7"
dependencies = [
"quote",
"syn",

View File

@ -13,7 +13,7 @@
[package]
edition = "2018"
name = "profiling"
version = "1.0.1"
version = "1.0.2"
authors = ["Philip Degarmo <aclysma@gmail.com>"]
description = "This crate provides a very thin abstraction over other profiler crates."
homepage = "https://github.com/aclysma/profiling"
@ -37,7 +37,7 @@ version = "1.3"
optional = true
[dependencies.profiling-procmacros]
version = "1.0.1"
version = "1.0.2"
optional = true
[dependencies.puffin]

View File

@ -66,12 +66,12 @@ impl Renderer {
Self::upload_font_atlas(&resource_manager, &graphics_queue, font_atlas_texture)?;
Ok(Renderer {
api,
swapchain_helper,
graphics_queue,
imgui_pass,
resource_manager,
font_atlas_texture,
imgui_pass,
graphics_queue,
swapchain_helper,
resource_manager,
api,
})
}

View File

@ -1,11 +1,11 @@
#[macro_export]
macro_rules! scope {
($name:expr) => {
let _span = $crate::tracing::span!(tracing::Level::INFO, $name);
let _span = $crate::tracing::span!($crate::tracing::Level::INFO, $name);
let _span_entered = _span.enter();
};
($name:expr, $data:expr) => {
let _span = $crate::tracing::span!(tracing::Level::INFO, $name, tag = $data);
let _span = $crate::tracing::span!($crate::tracing::Level::INFO, $name, tag = $data);
let _span_entered = _span.enter();
};
}