feat: use tracy frame marks

andrewgazelka · Nov 12, 2024 · a7c168e · a7c168e
1 parent 075999b
commit a7c168e
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 36 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/hyperion/Cargo.toml b/crates/hyperion/Cargo.toml
@@ -18,6 +18,7 @@ roaring = {workspace = true, features = ["simd"]}
 serde = {workspace = true, features = ["derive"]}
 tokio = {workspace = true, features = ["full", "tracing"]}
 tracing = {workspace = true}
+tracing-tracy.workspace = true
 uuid = {workspace = true, features = ["v3"]}
 anyhow.workspace = true
 base64.workspace = true

diff --git a/crates/hyperion/src/egress/mod.rs b/crates/hyperion/src/egress/mod.rs
@@ -19,7 +19,6 @@ use sync_chunks::SyncChunksModule;
 use sync_entity_state::EntityStateSyncModule;
 
 use crate::{
-    ingress::GametickSpan,
     net::NetworkStreamRef,
     simulation::{ChunkPosition, blocks::Blocks},
     system_registry::SystemId,
@@ -168,24 +167,15 @@ impl Module for EgressModule {
             "clear_bump",
             world,
             &mut Compose($),
-            &mut GametickSpan($)
         )
         .kind_id(pipeline)
-        .each(move |(compose, gametick_span)| {
+        .each(move |compose| {
             let span = info_span!("clear_bump");
             let _enter = span.enter();
 
             for bump in &mut compose.bump {
                 bump.reset();
             }
-
-            replace_with::replace_with_or_abort(gametick_span, |span| {
-                let GametickSpan::Entered(span) = span else {
-                    panic!("gametick_span should be exited");
-                };
-
-                GametickSpan::Exited(span.exit())
-            });
         });
     }
 }
diff --git a/crates/hyperion/src/ingress/mod.rs b/crates/hyperion/src/ingress/mod.rs
@@ -6,7 +6,7 @@ use flecs_ecs::prelude::*;
 use hyperion_utils::EntityExt;
 use serde_json::json;
 use sha2::Digest;
-use tracing::{error, info, info_span, span::EnteredSpan, trace, warn};
+use tracing::{error, info, info_span, trace, warn};
 use valence_protocol::{
     Bounded, Packet, VarInt, packets,
     packets::{
@@ -269,22 +269,9 @@ fn process_status(
 #[derive(Component)]
 pub struct IngressModule;
 
-#[derive(Component)]
-pub enum GametickSpan {
-    Entered(EnteredSpan),
-    Exited(tracing::Span),
-}
-
-#[allow(clippy::non_send_fields_in_send_ty)]
-unsafe impl Send for GametickSpan {}
-unsafe impl Sync for GametickSpan {}
-
 impl Module for IngressModule {
     #[expect(clippy::too_many_lines)]
     fn module(world: &World) {
-        world.component::<GametickSpan>();
-        world.set(GametickSpan::Exited(tracing::info_span!("tick")));
-
         system!(
             "update_ign_map",
             world,
@@ -301,19 +288,14 @@ impl Module for IngressModule {
             world,
             &mut StreamLookup($),
             &ReceiveState($),
-            &mut GametickSpan($)
         )
         .immediate(true)
         .kind::<flecs::pipeline::OnLoad>()
         .term_at(0)
-        .each_iter(move |it, _, (lookup, receive, gametick_span)| {
-            replace_with::replace_with_or_abort(gametick_span, |span| {
-                let GametickSpan::Exited(span) = span else {
-                    panic!("gametick_span should be exited");
-                };
-
-                GametickSpan::Entered(span.entered())
-            });
+        .each_iter(move |it, _, (lookup, receive)| {
+            tracing_tracy::client::Client::running()
+                .expect("Tracy client should be running")
+                .frame_mark();
 
             let span = info_span!("generate_ingress_events");
             let _enter = span.enter();

diff --git a/crates/hyperion/src/lib.rs b/crates/hyperion/src/lib.rs
@@ -77,7 +77,7 @@ pub use valence_ident;
 
 pub use crate::simulation::command::CommandScope;
 use crate::{
-    ingress::{GametickSpan, PendingRemove},
+    ingress::PendingRemove,
     net::{NetworkStreamRef, PacketDecoder, proxy::ReceiveState},
     runtime::Tasks,
     simulation::{
@@ -218,7 +218,6 @@ impl Hyperion {
             .next()
             .context("could not get first address")?;
 
-        world.component::<GametickSpan>();
         world.component::<Pose>();
         world.component::<Prev<Pose>>();