commit bbfe603e5ae42317a2b67d713d00882bea341c88
author Jim Flynn <jim.flynn@arm.com> Mon Jul 20 16:57:44 2020 +0100
committer Jim Flynn <jim.flynn@arm.com> Wed Jul 29 15:35:15 2020 +0100
tree 8d8a78d6836384fb92fb9741c865443624dfec68
parent a9c2ce123a6a5a68728d040a0323c482bbe46903

IVGCVSW-5166 Pull out the common and server side code into standalone libraries

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

src/profiling/test/TestTimelinePacketHandler.hpp

diff --git a/src/profiling/test/TestTimelinePacketHandler.hpp b/src/profiling/test/TestTimelinePacketHandler.hpp
index 08239fc..ab6eee5 100644
--- a/src/profiling/test/TestTimelinePacketHandler.hpp
+++ b/src/profiling/test/TestTimelinePacketHandler.hpp
@@ -6,14 +6,15 @@
 #pragma once
 
 #include <armnn/profiling/ILocalPacketHandler.hpp>
-#include <armnn/profiling/ITimelineDecoder.hpp>
-#include <Packet.hpp>
+#include <server/include/timelineDecoder/ITimelineDecoder.hpp>
 
 #include "ProfilingUtils.hpp"
-#include "TimelineCaptureCommandHandler.hpp"
-#include "TimelineDirectoryCaptureCommandHandler.hpp"
+#include <server/include/timelineDecoder/TimelineCaptureCommandHandler.hpp>
+#include <server/include/timelineDecoder/TimelineDirectoryCaptureCommandHandler.hpp>
 #include "TimelineModel.hpp"
 
+#include <common/include/Packet.hpp>
+
 #include <condition_variable>
 #include <map>
 #include <mutex>
@@ -27,7 +28,7 @@
 
 // forward declaration of class
 class TestTimelinePacketHandler;
-class TimelineMessageDecoder : public ITimelineDecoder
+class TimelineMessageDecoder : public arm::pipe::ITimelineDecoder
 {
 public:
     TimelineMessageDecoder(TimelineModel& model) : m_PacketHandler(nullptr), m_TimelineModel(model) {}
@@ -57,7 +58,7 @@
 
     virtual std::vector<uint32_t> GetHeadersAccepted() override; // ILocalPacketHandler
 
-    virtual void HandlePacket(const Packet& packet) override; // ILocalPacketHandler
+    virtual void HandlePacket(const arm::pipe::Packet& packet) override; // ILocalPacketHandler
 
     void Stop();
 
@@ -72,8 +73,8 @@
     }
 
 private:
-    void ProcessDirectoryPacket(const Packet& packet);
-    void ProcessMessagePacket(const Packet& packet);
+    void ProcessDirectoryPacket(const arm::pipe::Packet& packet);
+    void ProcessMessagePacket(const arm::pipe::Packet& packet);
     IInternalProfilingConnection* m_Connection;
     std::mutex m_InferenceCompletedMutex;
     std::condition_variable m_InferenceCompletedConditionVariable;
@@ -82,8 +83,8 @@
     uint32_t m_DirectoryHeader;
     uint32_t m_MessageHeader;
     TimelineMessageDecoder m_MessageDecoder;
-    timelinedecoder::TimelineCaptureCommandHandler m_Decoder;
-    timelinedecoder::TimelineDirectoryCaptureCommandHandler m_DirectoryDecoder;
+    arm::pipe::TimelineCaptureCommandHandler m_Decoder;
+    arm::pipe::TimelineDirectoryCaptureCommandHandler m_DirectoryDecoder;
 };
 
 } // namespace profiling