From 83d08a95af015e53f343aadd6be878e761caabf1 Mon Sep 17 00:00:00 2001 From: Jim Flynn Date: Thu, 9 Jul 2020 13:48:16 +0100 Subject: IVGCVSW-5076 Correct Profiling Stream Metadata packet revision table Change-Id: Ic3f8637642d3f3a5925f5b82e3729b3b654a7f3e Signed-off-by: Jim Flynn --- src/profiling/test/SendCounterPacketTests.cpp | 54 ++++++++++++++++++++------- 1 file changed, 41 insertions(+), 13 deletions(-) (limited to 'src/profiling/test/SendCounterPacketTests.cpp') diff --git a/src/profiling/test/SendCounterPacketTests.cpp b/src/profiling/test/SendCounterPacketTests.cpp index dc9671bcc8..c5f9177c90 100644 --- a/src/profiling/test/SendCounterPacketTests.cpp +++ b/src/profiling/test/SendCounterPacketTests.cpp @@ -1,5 +1,5 @@ // -// Copyright © 2019 Arm Ltd. All rights reserved. +// Copyright © 2019 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // @@ -307,7 +307,39 @@ BOOST_AUTO_TEST_CASE(SendStreamMetaDataPacketTest) uint32_t softwareVersionSize = numeric_cast(GetSoftwareVersion().size()) + 1; uint32_t processNameSize = numeric_cast(processName.size()) + 1; - uint32_t packetEntries = 6; + // Supported Packets + // Packet Encoding version 1.0.0 + // Control packet family + // Stream metadata packet (packet family=0; packet id=0) + // Connection Acknowledged packet ( packet family=0, packet id=1) Version 1.0.0 + // Counter Directory packet (packet family=0; packet id=2) Version 1.0.0 + // Request Counter Directory packet ( packet family=0, packet id=3) Version 1.0.0 + // Periodic Counter Selection packet ( packet family=0, packet id=4) Version 1.0.0 + // Per Job Counter Selection packet ( packet family=0, packet id=5) Version 1.0.0 + // Activate Timeline Reporting (packet family = 0, packet id = 6) Version 1.0.0 + // Deactivate Timeline Reporting (packet family = 0, packet id = 7) Version 1.0.0 + // Counter Packet Family + // Periodic Counter Capture (packet_family = 3, packet_class = 0, packet_type = 0) Version 1.0.0 + // Per-Job Counter Capture (packet_family = 3, packet_class = 1, packet_type = 0,1) Version 1.0.0 + // Timeline Packet Family + // Timeline Message Directory (packet_family = 1, packet_class = 0, packet_type = 0) Version 1.0.0 + // Timeline Message (packet_family = 1, packet_class = 0, packet_type = 1) Version 1.0.0 + std::vector> packetVersions; + packetVersions.push_back(std::make_pair(ConstructHeader(0, 0), EncodeVersion(1, 0, 0))); + packetVersions.push_back(std::make_pair(ConstructHeader(0, 1), EncodeVersion(1, 0, 0))); + packetVersions.push_back(std::make_pair(ConstructHeader(0, 2), EncodeVersion(1, 0, 0))); + packetVersions.push_back(std::make_pair(ConstructHeader(0, 3), EncodeVersion(1, 0, 0))); + packetVersions.push_back(std::make_pair(ConstructHeader(0, 4), EncodeVersion(1, 0, 0))); + packetVersions.push_back(std::make_pair(ConstructHeader(0, 5), EncodeVersion(1, 0, 0))); + packetVersions.push_back(std::make_pair(ConstructHeader(0, 6), EncodeVersion(1, 0, 0))); + packetVersions.push_back(std::make_pair(ConstructHeader(0, 7), EncodeVersion(1, 0, 0))); + packetVersions.push_back(std::make_pair(ConstructHeader(3, 0, 0), EncodeVersion(1, 0, 0))); + packetVersions.push_back(std::make_pair(ConstructHeader(3, 1, 0), EncodeVersion(1, 0, 0))); + packetVersions.push_back(std::make_pair(ConstructHeader(3, 1, 1), EncodeVersion(1, 0, 0))); + packetVersions.push_back(std::make_pair(ConstructHeader(1, 0, 0), EncodeVersion(1, 0, 0))); + packetVersions.push_back(std::make_pair(ConstructHeader(1, 0, 1), EncodeVersion(1, 0, 0))); + + uint32_t packetEntries = static_cast(packetVersions.size()); MockBufferManager mockBuffer2(512); SendCounterPacket sendPacket2(mockBuffer2); @@ -382,22 +414,18 @@ BOOST_AUTO_TEST_CASE(SendStreamMetaDataPacketTest) if (packetEntries) { - BOOST_TEST((ReadUint32(readBuffer2, offset) >> 16) == packetEntries); + uint32_t numberOfEntries = ReadUint32(readBuffer2, offset); + BOOST_TEST((numberOfEntries >> 16) == packetEntries); offset += sizeUint32; - for (uint32_t i = 0; i < packetEntries - 1; ++i) + for (std::pair& packetVersion : packetVersions) { - BOOST_TEST(((ReadUint32(readBuffer2, offset) >> 26) & 0x3F) == 0); - BOOST_TEST(((ReadUint32(readBuffer2, offset) >> 16) & 0x3FF) == i); + uint32_t readPacketId = ReadUint32(readBuffer2, offset); + BOOST_TEST(packetVersion.first == readPacketId); offset += sizeUint32; - BOOST_TEST(ReadUint32(readBuffer2, offset) == EncodeVersion(1, 0, 0)); + uint32_t readVersion = ReadUint32(readBuffer2, offset); + BOOST_TEST(packetVersion.second == readVersion); offset += sizeUint32; } - - BOOST_TEST(((ReadUint32(readBuffer2, offset) >> 26) & 0x3F) == 1); - BOOST_TEST(((ReadUint32(readBuffer2, offset) >> 16) & 0x3FF) == 0); - offset += sizeUint32; - BOOST_TEST(ReadUint32(readBuffer2, offset) == EncodeVersion(1, 0, 0)); - offset += sizeUint32; } BOOST_TEST(offset == totalLength); -- cgit v1.2.1