Mark the probe-only packets with a ligher blue color
diff --git a/tools/render/processed_trace.cc b/tools/render/processed_trace.cc index 4c1eaab..5f9a7de 100644 --- a/tools/render/processed_trace.cc +++ b/tools/render/processed_trace.cc
@@ -66,6 +66,31 @@ } // namespace +ProcessedTrace::StreamAnnotations::StreamAnnotations(const Trace& trace) { + for (const StreamAnnotation& annotation : trace.stream_annotations()) { + if (annotation.has_moqt_probe_stream()) { + probe_streams_.insert(annotation.stream_id()); + } + } +} + +bool ProcessedTrace::StreamAnnotations::IsProbeOnlyPacket(const Event& event) { + int probe_streams = 0; + int non_probe_streams = 0; + for (const Frame& frame : event.frames()) { + if (!frame.has_stream_frame_info()) { + break; + } + uint64_t stream_id = frame.stream_frame_info().stream_id(); + if (probe_streams_.contains(stream_id)) { + ++probe_streams; + } else { + ++non_probe_streams; + } + } + return probe_streams > 0 && non_probe_streams == 0; +} + void ProcessedTrace::AddPacket(TraceRenderer* renderer, const Event& packet, Interval interval, @@ -111,6 +136,7 @@ TraceRenderer* renderer) { renderer->PacketCountHint(trace->events_size()); + StreamAnnotations annotations(*trace); quic_trace::NumberingWithoutRetransmissions numbering; size_t largest_sent = 0; uint64_t largest_time = 0; @@ -123,7 +149,9 @@ if (event.event_type() == PACKET_SENT) { Interval mapped = numbering.AssignTraceNumbering(event); - AddPacket(renderer, event, mapped, PacketType::SENT); + AddPacket(renderer, event, mapped, + annotations.IsProbeOnlyPacket(event) ? PacketType::PROBE + : PacketType::SENT); largest_sent = std::max<size_t>(mapped.offset + mapped.size, largest_sent); }
diff --git a/tools/render/processed_trace.h b/tools/render/processed_trace.h index 2530103..ca41dcf 100644 --- a/tools/render/processed_trace.h +++ b/tools/render/processed_trace.h
@@ -75,6 +75,17 @@ } }; + // Metadata extracted from the stream_annotations field of the trace. + class StreamAnnotations { + public: + explicit StreamAnnotations(const Trace& trace); + + bool IsProbeOnlyPacket(const Event& event); + + private: + absl::flat_hash_set<uint64_t> probe_streams_; + }; + void AddPacket(TraceRenderer* renderer, const Event& packet, Interval interval,
diff --git a/tools/render/trace_renderer.cc b/tools/render/trace_renderer.cc index b2f89cc..1223aa5 100644 --- a/tools/render/trace_renderer.cc +++ b/tools/render/trace_renderer.cc
@@ -75,6 +75,10 @@ if (kind <= -3) { v_color = vec4(1.0, 0.425, 0.0, 1.0); } + // Probes are light blue. + if (kind <= -4) { + v_color = vec4(0.75, 0.75, 1.0, 1.0); + } // Highlight the specified packet by making it brighter. if (highlighted_packet == gl_PrimitiveIDIn) { v_color = kUnit - (kUnit - v_color) * 0.3; @@ -118,7 +122,11 @@ return -2; case PacketType::APP_LIMITED: return -3; + case PacketType::PROBE: + return -4; } + // Should be unreachable. + return 0; } } // namespace
diff --git a/tools/render/trace_renderer.h b/tools/render/trace_renderer.h index e5f833d..31ec77f 100644 --- a/tools/render/trace_renderer.h +++ b/tools/render/trace_renderer.h
@@ -25,7 +25,7 @@ namespace quic_trace { namespace render { -enum class PacketType { SENT, ACKED, LOST, APP_LIMITED }; +enum class PacketType { SENT, ACKED, LOST, APP_LIMITED, PROBE }; // Draws the trace on the current OpenGL context. class TraceRenderer {