commit 2ffcc4179648bbd6fb08342969391a2bcd027221
author Matteo Martincigh <matteo.martincigh@arm.com> Tue Nov 05 11:47:40 2019 +0000
committer Jim Flynn Arm <jim.flynn@arm.com> Tue Nov 05 14:27:39 2019 +0000
tree f5d06780073bf8354a6b0195dca9961dc1f03ed5
parent b67f95796b03c1a5d3b3fa6a40f6baf85bdd09cb

IVGCVSW-4065 Refactor the IPacketBuffer smart pointers

 * Added convenience "using" statement for the unique pointers to
   IPacketBuffer
 * Replaced all the occurrencies in the code

Signed-off-by: Matteo Martincigh <matteo.martincigh@arm.com>
Change-Id: Iffec3a425ffbc1ecb23012971563a48139eb32eb

src/profiling/test/SendCounterPacketTests.hpp

diff --git a/src/profiling/test/SendCounterPacketTests.hpp b/src/profiling/test/SendCounterPacketTests.hpp
index 73fc39b..d70239e 100644
--- a/src/profiling/test/SendCounterPacketTests.hpp
+++ b/src/profiling/test/SendCounterPacketTests.hpp
@@ -145,7 +145,7 @@
 
     ~MockBufferManager() {}
 
-    std::unique_ptr<IPacketBuffer> Reserve(unsigned int requestedSize, unsigned int& reservedSize) override
+    IPacketBufferPtr Reserve(unsigned int requestedSize, unsigned int& reservedSize) override
     {
         if (requestedSize > m_BufferSize)
         {
@@ -159,24 +159,24 @@
         return std::move(m_Buffer);
     }
 
-    void Commit(std::unique_ptr<IPacketBuffer>& packetBuffer, unsigned int size) override
+    void Commit(IPacketBufferPtr& packetBuffer, unsigned int size) override
     {
         packetBuffer->Commit(size);
         m_Buffer = std::move(packetBuffer);
     }
 
-    std::unique_ptr<IPacketBuffer> GetReadableBuffer() override
+    IPacketBufferPtr GetReadableBuffer() override
     {
         return std::move(m_Buffer);
     }
 
-    void Release(std::unique_ptr<IPacketBuffer>& packetBuffer) override
+    void Release(IPacketBufferPtr& packetBuffer) override
     {
         packetBuffer->Release();
         m_Buffer = std::move(packetBuffer);
     }
 
-    void MarkRead(std::unique_ptr<IPacketBuffer>& packetBuffer) override
+    void MarkRead(IPacketBufferPtr& packetBuffer) override
     {
         packetBuffer->MarkRead();
         m_Buffer = std::move(packetBuffer);
@@ -184,14 +184,12 @@
 
 private:
     unsigned int m_BufferSize;
-    std::unique_ptr<IPacketBuffer> m_Buffer;
+    IPacketBufferPtr m_Buffer;
 };
 
 class MockStreamCounterBuffer : public IBufferManager
 {
 public:
-    using IPacketBufferPtr = std::unique_ptr<IPacketBuffer>;
-
     MockStreamCounterBuffer(unsigned int maxBufferSize = 4096)
         : m_MaxBufferSize(maxBufferSize)
         , m_BufferList()
@@ -286,7 +284,7 @@
     {
         std::string message("SendStreamMetaDataPacket");
         unsigned int reserved = 0;
-        std::unique_ptr<IPacketBuffer> buffer = m_BufferManager.Reserve(1024, reserved);
+        IPacketBufferPtr buffer = m_BufferManager.Reserve(1024, reserved);
         memcpy(buffer->GetWritableData(), message.c_str(), static_cast<unsigned int>(message.size()) + 1);
         m_BufferManager.Commit(buffer, reserved);
     }
@@ -295,7 +293,7 @@
     {
         std::string message("SendCounterDirectoryPacket");
         unsigned int reserved = 0;
-        std::unique_ptr<IPacketBuffer> buffer = m_BufferManager.Reserve(1024, reserved);
+        IPacketBufferPtr buffer = m_BufferManager.Reserve(1024, reserved);
         memcpy(buffer->GetWritableData(), message.c_str(), static_cast<unsigned int>(message.size()) + 1);
         m_BufferManager.Commit(buffer, reserved);
     }
@@ -305,7 +303,7 @@
     {
         std::string message("SendPeriodicCounterCapturePacket");
         unsigned int reserved = 0;
-        std::unique_ptr<IPacketBuffer> buffer = m_BufferManager.Reserve(1024, reserved);
+        IPacketBufferPtr buffer = m_BufferManager.Reserve(1024, reserved);
         memcpy(buffer->GetWritableData(), message.c_str(), static_cast<unsigned int>(message.size()) + 1);
         m_BufferManager.Commit(buffer, reserved);
     }
@@ -315,7 +313,7 @@
     {
         std::string message("SendPeriodicCounterSelectionPacket");
         unsigned int reserved = 0;
-        std::unique_ptr<IPacketBuffer> buffer = m_BufferManager.Reserve(1024, reserved);
+        IPacketBufferPtr buffer = m_BufferManager.Reserve(1024, reserved);
         memcpy(buffer->GetWritableData(), message.c_str(), static_cast<unsigned int>(message.size()) + 1);
         m_BufferManager.Commit(buffer, reserved);
     }