Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 12:40:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

chore: Simplify tracing with servo_tracing macro (#36661) (#37497)

Browse source 
This pull request refactors existing tracing annotations to leverage the
new `servo_tracing::instrument` macro introduced in #36573.

Specifically, the following transformations were applied:
- Removed `#[cfg_attr(feature = "tracing", ...)]` wrappers.
- Replaced `tracing::instrument` with `servo_tracing::instrument`.
- Removed `level = "trace"`
- Removed `fields(servo_profiling = true)` from tracing attributes
however retained others like `name`. `skip type`

Closes: #36661

---------

Signed-off-by: Bhuwan Pandit <bhuwanpandit109@gmail.com>
Signed-off-by: Jonathan Schwender <55576758+jschwe@users.noreply.github.com>
Co-authored-by: Jonathan Schwender <55576758+jschwe@users.noreply.github.com>
This commit is contained in:
Bhuwan Pandit 2025-06-18 17:18:04 +01:00 • committed by GitHub
parent bdf8c0ebc8
commit 04bcafa140
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
16 changed files with 137 additions and 527 deletions
Download patch file Download diff file Expand all files Collapse all files

51
components/layout/flexbox/layout.rs
View file

@ -426,15 +426,7 @@ struct FlexItemBoxInlineContentSizesInfo {
}
impl ComputeInlineContentSizes for FlexContainer {
#[cfg_attr(
feature = "tracing",
tracing::instrument(
name = "FlexContainer::compute_inline_content_sizes",
skip_all,
fields(servo_profiling = true),
level = "trace",
)
)]
#[servo_tracing::instrument(name = "FlexContainer::compute_inline_content_sizes", skip_all)]
fn compute_inline_content_sizes(
&self,
layout_context: &LayoutContext,
@ -635,14 +627,10 @@ impl FlexContainer {
}
/// <https://drafts.csswg.org/css-flexbox/#layout-algorithm>
#[cfg_attr(
feature = "tracing",
tracing::instrument(
name = "FlexContainer::layout",
skip_all,
fields(servo_profiling = true, self_address = self as *const _ as usize),
level = "trace",
)
#[servo_tracing::instrument(
name = "FlexContainer::layout",
skip_all,
fields(self_address = self as *const _ as usize)
)]
pub(crate) fn layout(
&self,
@ -1743,18 +1731,13 @@ impl FlexItem<'_> {
/// From <https://drafts.csswg.org/css-flexbox/#algo-cross-item>:
/// > performing layout as if it were an in-flow block-level box with the used main
/// > size and the given available space, treating `auto` as `fit-content`.
#[cfg_attr(
feature = "tracing",
tracing::instrument(
name = "FlexItem::layout",
skip_all,
fields(
servo_profiling = true,
self_address = self as *const _ as usize,
box_address = self.box_ as *const _ as usize,
for_stretch = non_stretch_layout_result.is_some(),
),
level = "trace",
#[servo_tracing::instrument(
name = "FlexItem::layout",
skip_all,
fields(
self_address = self as *const _ as usize,
box_address = self.box_ as *const _ as usize,
for_stretch = non_stretch_layout_result.is_some()
)
)]
#[allow(clippy::too_many_arguments)]
@ -2595,15 +2578,7 @@ impl FlexItemBox {
}
#[allow(clippy::too_many_arguments)]
#[cfg_attr(
feature = "tracing",
tracing::instrument(
name = "FlexContainer::layout_for_block_content_size",
skip_all,
fields(servo_profiling = true),
level = "trace",
)
)]
#[servo_tracing::instrument(name = "FlexContainer::layout_for_block_content_size", skip_all)]
fn layout_for_block_content_size(
&self,
flex_context: &FlexContext,