Skip to content

Move event traces to detailed_trace! #7732

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
james7132 merged 3 commits into from
Apr 11, 2023
Merged

Move event traces to detailed_trace! #7732

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
af98293
Move event traces to detailed_trace!
james7132 Feb 17, 2023
d1fdf7f
Merge branch 'main' into detailed-trace-events
james7132 Mar 29, 2023
ca364a5
Merge branch 'main' into detailed-trace-events
james7132 Mar 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions crates/bevy_ecs/src/event.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

use crate as bevy_ecs;
use crate::system::{Local, Res, ResMut, Resource, SystemParam};
use bevy_utils::tracing::trace;
use bevy_utils::detailed_trace;
use std::ops::{Deref, DerefMut};
use std::{fmt, hash::Hash, iter::Chain, marker::PhantomData, slice::Iter};
/// A type that can be stored in an [`Events<E>`] resource
Expand Down Expand Up @@ -411,10 +411,6 @@ pub struct ManualEventIteratorWithId<'a, E: Event> {
unread: usize,
}

fn event_trace<E: Event>(id: EventId<E>) {
trace!("EventReader::iter() -> {}", id);
}

impl<'a, E: Event> ManualEventIteratorWithId<'a, E> {
pub fn new(reader: &'a mut ManualEventReader<E>, events: &'a Events<E>) -> Self {
let a_index = (reader.last_event_count).saturating_sub(events.events_a.start_event_count);
Expand Down Expand Up @@ -451,7 +447,7 @@ impl<'a, E: Event> Iterator for ManualEventIteratorWithId<'a, E> {
.map(|instance| (&instance.event, instance.event_id))
{
Some(item) => {
event_trace(item.1);
detailed_trace!("EventReader::iter() -> {}", item.1);
self.reader.last_event_count += 1;
self.unread -= 1;
Some(item)
Expand Down Expand Up @@ -505,7 +501,7 @@ impl<E: Event> Events<E> {
id: self.event_count,
_marker: PhantomData,
};
trace!("Events::send() -> id: {}", event_id);
detailed_trace!("Events::send() -> id: {}", event_id);

let event_instance = EventInstance { event_id, event };

Expand Down Expand Up @@ -644,7 +640,7 @@ impl<E: Event> std::iter::Extend<E> for Events<E> {

self.events_b.extend(events);

trace!(
detailed_trace!(
"Events::extend() -> ids: ({}..{})",
self.event_count,
event_count
Expand Down