diff options
| author | Jim Flynn <jim.flynn@arm.com> | 2020-05-26 21:10:49 +0100 |
|---|---|---|
| committer | Jim Flynn <jim.flynn@arm.com> | 2020-05-27 15:05:25 +0000 |
| commit | 1892d210d089cfbf355b44e32feb40bcb283ffc3 (patch) | |
| tree | 28e53f6b63443b89cf6198f2e94af353d43e3aa6 /src/timelineDecoder | |
| parent | 83fcf988cc1d5c9254a19258d6d67362c04bbaf4 (diff) | |
| download | armnn-1892d210d089cfbf355b44e32feb40bcb283ffc3.tar.gz | |
IVGCVSW-4735 Add label GUID to timeline eventClass message
Change-Id: Ie205d8146f5bb1920bf001b7623ead79e2ab9e48
Signed-off-by: Jim Flynn <jim.flynn@arm.com>
Diffstat (limited to 'src/timelineDecoder')
| -rw-r--r-- | src/timelineDecoder/TimelineCaptureCommandHandler.cpp | 2 | ||||
| -rw-r--r-- | src/timelineDecoder/tests/TimelineTests.cpp | 14 |
2 files changed, 10 insertions, 6 deletions
diff --git a/src/timelineDecoder/TimelineCaptureCommandHandler.cpp b/src/timelineDecoder/TimelineCaptureCommandHandler.cpp index 69389115a0..9d1e8eee16 100644 --- a/src/timelineDecoder/TimelineCaptureCommandHandler.cpp +++ b/src/timelineDecoder/TimelineCaptureCommandHandler.cpp @@ -89,6 +89,8 @@ void TimelineCaptureCommandHandler::ReadEventClass(const unsigned char* data, ui ITimelineDecoder::EventClass eventClass; eventClass.m_Guid = profiling::ReadUint64(data, offset); offset += uint64_t_size; + eventClass.m_NameGuid = profiling::ReadUint64(data, offset); + offset += uint64_t_size; m_TimelineDecoder.CreateEventClass(eventClass); } diff --git a/src/timelineDecoder/tests/TimelineTests.cpp b/src/timelineDecoder/tests/TimelineTests.cpp index 390b589b7f..8d0b8a0f08 100644 --- a/src/timelineDecoder/tests/TimelineTests.cpp +++ b/src/timelineDecoder/tests/TimelineTests.cpp @@ -168,6 +168,7 @@ BOOST_AUTO_TEST_CASE(TimelineCaptureTest) const uint64_t entityGuid = 111111u; const uint64_t eventClassGuid = 22222u; + const uint64_t eventClassNameGuid = 22322u; const uint64_t timestamp = 33333u; const uint64_t eventGuid = 44444u; @@ -205,7 +206,7 @@ BOOST_AUTO_TEST_CASE(TimelineCaptureTest) timelineCaptureCommandHandler); // Send event class - sendTimelinePacket->SendTimelineEventClassBinaryPacket(eventClassGuid); + sendTimelinePacket->SendTimelineEventClassBinaryPacket(eventClassGuid, eventClassNameGuid); sendTimelinePacket->Commit(); SendTimelinePacketToCommandHandler(bufferManager.GetReadableBuffer()->GetReadableData(), timelineCaptureCommandHandler); @@ -278,10 +279,11 @@ BOOST_AUTO_TEST_CASE(TimelineCaptureTestMultipleStringsInBuffer) BOOST_CHECK(timelineDecoder.SetLabelCallback(PushLabel) == Status::TimelineStatus_Success); BOOST_CHECK(timelineDecoder.SetRelationshipCallback(PushRelationship) == Status::TimelineStatus_Success); - const uint64_t entityGuid = 111111u; - const uint64_t eventClassGuid = 22222u; - const uint64_t timestamp = 33333u; - const uint64_t eventGuid = 44444u; + const uint64_t entityGuid = 111111u; + const uint64_t eventClassGuid = 22222u; + const uint64_t eventClassNameGuid = 22322u; + const uint64_t timestamp = 33333u; + const uint64_t eventGuid = 44444u; const std::thread::id threadId = std::this_thread::get_id(); @@ -316,7 +318,7 @@ BOOST_AUTO_TEST_CASE(TimelineCaptureTestMultipleStringsInBuffer) // Send entity sendTimelinePacket->SendTimelineEntityBinaryPacket(entityGuid); // Send event class - sendTimelinePacket->SendTimelineEventClassBinaryPacket(eventClassGuid); + sendTimelinePacket->SendTimelineEventClassBinaryPacket(eventClassGuid, eventClassNameGuid); // Send event sendTimelinePacket->SendTimelineEventBinaryPacket(timestamp, threadId, eventGuid); // Send label |