commit 397043fa3d900430e9e0f6d328b76898f9613388
author Jim Flynn <jim.flynn@arm.com> Thu Oct 17 17:37:10 2019 +0100
committer Jim Flynn <jim.flynn@arm.com> Fri Oct 18 09:58:17 2019 +0100
tree dc2cfbcff1a098881d05a97c3d96f4e902575953
parent 9ea7700bde128f2601d5b7d8849e96c0a08e15c6

IVGCVSW-4002 Add FamilyId to CommandHandlerKey

Change-Id: I0bb0bf77da2bcd7f4746078c4ccee9acc98638a7
Signed-off-by: Jim Flynn <jim.flynn@arm.com>

src/profiling/CommandHandlerKey.cpp

diff --git a/src/profiling/CommandHandlerKey.cpp b/src/profiling/CommandHandlerKey.cpp
index 66b20c5..4d7e11a 100644
--- a/src/profiling/CommandHandlerKey.cpp
+++ b/src/profiling/CommandHandlerKey.cpp
@@ -11,6 +11,11 @@
 namespace profiling
 {
 
+uint32_t CommandHandlerKey::GetFamilyId() const
+{
+    return m_FamilyId;
+}
+
 uint32_t CommandHandlerKey::GetPacketId() const
 {
     return m_PacketId;
@@ -24,16 +29,21 @@
 bool CommandHandlerKey::operator<(const CommandHandlerKey& rhs) const
 {
     bool result = true;
-
-    if (m_PacketId == rhs.m_PacketId)
+    if (m_FamilyId == rhs.m_FamilyId)
     {
-        result = m_Version < rhs.m_Version;
+        if (m_PacketId == rhs.m_PacketId)
+        {
+            result = m_Version < rhs.m_Version;
+        }
+        else if (m_PacketId > rhs.m_PacketId)
+        {
+            result = false;
+        }
     }
-    else if (m_PacketId > rhs.m_PacketId)
+    else if (m_FamilyId > rhs.m_FamilyId)
     {
         result = false;
     }
-
     return result;
 }
 
@@ -54,7 +64,7 @@
 
 bool CommandHandlerKey::operator==(const CommandHandlerKey& rhs) const
 {
-    return m_PacketId == rhs.m_PacketId && m_Version == rhs.m_Version;
+    return m_FamilyId == rhs.m_FamilyId && m_PacketId == rhs.m_PacketId && m_Version == rhs.m_Version;
 }
 
 bool CommandHandlerKey::operator!=(const CommandHandlerKey& rhs) const