commit 6be1e9be49a9166392dbd77bf2effdd7c28d7ef1
author Finn Williams <Finn.Williams@arm.com> Fri May 15 11:21:54 2020 +0100
committer Jim Flynn <jim.flynn@arm.com> Fri May 15 11:50:21 2020 +0000
tree 36d8fe87c3c73e1ed22be85f44ad9f91c7aa6399
parent 45544477d2c36d1695e1dd96b33f4c0355d3ef25

IVGCVSW-4835 Change CounterSet and Device name offsets sizes to bytes

Signed-off-by: Finn Williams <Finn.Williams@arm.com>
Change-Id: I5dee006d5532cc85b86997a4cd0877afbf043122

src/profiling/test/SendCounterPacketTests.cpp

diff --git a/src/profiling/test/SendCounterPacketTests.cpp b/src/profiling/test/SendCounterPacketTests.cpp
index 9b3a86a..e7e2312 100644
--- a/src/profiling/test/SendCounterPacketTests.cpp
+++ b/src/profiling/test/SendCounterPacketTests.cpp
@@ -430,7 +430,7 @@
     };
     BOOST_CHECK(deviceRecordWord0[0] == deviceUid); // uid
     BOOST_CHECK(deviceRecordWord0[1] == deviceCores); // cores
-    BOOST_CHECK(deviceRecord[1] == 2); // name_offset
+    BOOST_CHECK(deviceRecord[1] == 8); // name_offset
     BOOST_CHECK(deviceRecord[2] == deviceName.size() + 1); // The length of the SWTrace string (name)
     BOOST_CHECK(std::memcmp(deviceRecord.data() + 3, deviceName.data(), deviceName.size()) == 0); // name
 }
@@ -483,7 +483,7 @@
     };
     BOOST_CHECK(counterSetRecordWord0[0] == counterSetUid); // uid
     BOOST_CHECK(counterSetRecordWord0[1] == counterSetCount); // cores
-    BOOST_CHECK(counterSetRecord[1] == 2); // name_offset
+    BOOST_CHECK(counterSetRecord[1] == 8); // name_offset
     BOOST_CHECK(counterSetRecord[2] == counterSetName.size() + 1); // The length of the SWTrace string (name)
     BOOST_CHECK(std::memcmp(counterSetRecord.data() + 3, counterSetName.data(), counterSetName.size()) == 0); // name
 }
@@ -1342,7 +1342,7 @@
         deviceRecord.name_offset = deviceRecordWord1;                      // name_offset
 
         uint32_t deviceRecordPoolOffset = deviceRecordOffsets[i] +                  // Packet body offset
-                                          deviceRecord.name_offset * uint32_t_size; // Device name offset
+                                          deviceRecord.name_offset; // Device name offset
         uint32_t deviceRecordNameLength = ReadUint32(readBuffer, deviceRecordPoolOffset);
         deviceRecord.name_length = deviceRecordNameLength; // name_length
         unsigned char deviceRecordNameNullTerminator = // name null-terminator
@@ -1402,7 +1402,7 @@
         counterSetRecord.name_offset = counterSetRecordWord1;                      // name_offset
 
         uint32_t counterSetRecordPoolOffset = counterSetRecordOffsets[i]  +                 // Packet body offset
-                                              counterSetRecord.name_offset * uint32_t_size; // Counter set name offset
+                                              counterSetRecord.name_offset; // Counter set name offset
         uint32_t counterSetRecordNameLength = ReadUint32(readBuffer, counterSetRecordPoolOffset);
         counterSetRecord.name_length = counterSetRecordNameLength; // name_length
         unsigned char counterSetRecordNameNullTerminator = // name null-terminator