forestia/bevy
2
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix bevy_ecs::schedule::executor_parallel::system span management (#2905)

Browse Source 
# Objective

- Fixes #2904 (see for context)

## Solution

- Simply hoist span creation out of the threaded task
- Confirmed to solve the issue locally

Now all events have the full span parent tree up through `bevy_ecs::schedule::stage` all the way to `bevy_app::app::bevy_app` (and its parents in bevy-consumer code, if any).
This commit is contained in:
Christopher Durham 2021-10-06 19:00:35 +00:00
parent a60fe30ada
commit 0887f41b58
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
crates/bevy_ecs/src/schedule/executor_parallel.rs
View File

@ -182,15 +182,14 @@ impl ParallelExecutor {
let start_receiver = system_data.start_receiver.clone(); let start_receiver = system_data.start_receiver.clone();
let finish_sender = self.finish_sender.clone(); let finish_sender = self.finish_sender.clone();
let system = unsafe { systems[index].system_mut_unsafe() }; let system = unsafe { systems[index].system_mut_unsafe() };
#[cfg(feature = "trace")] // NB: outside the task to get the TLS current span
let system_span = bevy_utils::tracing::info_span!("system", name = &*system.name());
let task = async move { let task = async move {
start_receiver start_receiver
.recv() .recv()
.await .await
.unwrap_or_else(|error| unreachable!(error)); .unwrap_or_else(|error| unreachable!(error));
#[cfg(feature = "trace")] #[cfg(feature = "trace")]
let system_span =
bevy_utils::tracing::info_span!("system", name = &*system.name());
#[cfg(feature = "trace")]
let system_guard = system_span.enter(); let system_guard = system_span.enter();
unsafe { system.run_unsafe((), world) }; unsafe { system.run_unsafe((), world) };
#[cfg(feature = "trace")] #[cfg(feature = "trace")]