From b24adb2726ce62bcb301b6ce112b2d12612992bd Mon Sep 17 00:00:00 2001 From: Shuhao Wu Date: Sun, 30 Jul 2023 15:24:58 -0400 Subject: [PATCH] Track event category is now handled --- examples/tracing_example/main.cc | 6 +++--- src/cactus_rt/tracing/trace_aggregator.cc | 9 ++++----- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/examples/tracing_example/main.cc b/examples/tracing_example/main.cc index 435cfbc..4d86dbe 100644 --- a/examples/tracing_example/main.cc +++ b/examples/tracing_example/main.cc @@ -39,17 +39,17 @@ class ExampleRTThread : public CyclicThread { private: void Sense() noexcept { - auto span = Tracer().WithSpan("Sense"); + auto span = Tracer().WithSpan("Sense", "app"); WasteTime(std::chrono::microseconds(100)); } void Plan() noexcept { - auto span = Tracer().WithSpan("Plan"); + auto span = Tracer().WithSpan("Plan", "app"); WasteTime(std::chrono::microseconds(50)); } void Act() noexcept { - auto span = Tracer().WithSpan("Act"); + auto span = Tracer().WithSpan("Act", "app"); WasteTime(std::chrono::microseconds(75)); } }; diff --git a/src/cactus_rt/tracing/trace_aggregator.cc b/src/cactus_rt/tracing/trace_aggregator.cc index 425f5b0..a705540 100644 --- a/src/cactus_rt/tracing/trace_aggregator.cc +++ b/src/cactus_rt/tracing/trace_aggregator.cc @@ -229,11 +229,10 @@ void TraceAggregator::AddTrackEventPacketToTrace( track_event->set_name(track_event_internal.name); } - // TODO: set category - // Trickier to do because this needs to allocate an array and stuff - // if (track_event.category != nullptr) { - // track_event_proto->set_categories(track_event.category); - // } + // TODO: support multiple categories later? + if (track_event_internal.category != nullptr) { + track_event->add_categories(track_event_internal.category); + } packet->set_allocated_track_event(track_event); packet->set_trusted_packet_sequence_id(thread_tracer.trusted_packet_sequence_id_);