commit 3896b47a3532aadcde43a3e7fed760a0f4a29e6b
author Sadik Armagan <sadik.armagan@arm.com> Mon Feb 10 12:24:15 2020 +0000
committer Sadik Armagan <sadik.armagan@arm.com> Mon Feb 10 14:08:54 2020 +0000
tree a22d1b6d5b2df7518c9116dd48a7ca1990b3ae66
parent 03181ff73f4b37d2132f15c4bd229a148840cc15

IVGCVSW-4328 BufferManager running out of buffers crashes application

* Refactored SendCounterPacket classes, separated SendCounterPacket from Send thread
* Created ISendThread.hpp, IConsumer, SendThread.hpp and SendThread.cpp
* Injected IConsumer to BufferManager to notify SendThread when packet is ready to read

Signed-off-by: Sadik Armagan <sadik.armagan@arm.com>
Change-Id: I80f0bb8b8401c6bfd1611f7760217c6fe35d7ad8

src/profiling/SendCounterPacket.hpp

diff --git a/src/profiling/SendCounterPacket.hpp b/src/profiling/SendCounterPacket.hpp
index 80d6f84..5a10711 100644
--- a/src/profiling/SendCounterPacket.hpp
+++ b/src/profiling/SendCounterPacket.hpp
@@ -8,14 +8,8 @@
 #include "IBufferManager.hpp"
 #include "ICounterDirectory.hpp"
 #include "ISendCounterPacket.hpp"
-#include "IProfilingConnection.hpp"
-#include "ProfilingStateMachine.hpp"
 #include "ProfilingUtils.hpp"
 
-#include <atomic>
-#include <condition_variable>
-#include <mutex>
-#include <thread>
 #include <type_traits>
 
 namespace armnn
@@ -33,19 +27,9 @@
     using EventRecord           = std::vector<uint32_t>;
     using IndexValuePairsVector = std::vector<std::pair<uint16_t, uint32_t>>;
 
-    SendCounterPacket(ProfilingStateMachine& profilingStateMachine, IBufferManager& buffer, int timeout = 1000)
-        : m_StateMachine(profilingStateMachine)
-        , m_BufferManager(buffer)
-        , m_Timeout(timeout)
-        , m_IsRunning(false)
-        , m_KeepRunning(false)
-        , m_SendThreadException(nullptr)
+    SendCounterPacket(IBufferManager& buffer)
+        : m_BufferManager(buffer)
     {}
-    ~SendCounterPacket()
-    {
-        // Don't rethrow when destructing the object
-        Stop(false);
-    }
 
     void SendStreamMetaDataPacket() override;
 
@@ -56,18 +40,9 @@
     void SendPeriodicCounterSelectionPacket(uint32_t capturePeriod,
                                             const std::vector<uint16_t>& selectedCounterIds) override;
 
-    void SetReadyToRead() override;
-
     static const unsigned int PIPE_MAGIC = 0x45495434;
 
-    void Start(IProfilingConnection& profilingConnection);
-    void Stop(bool rethrowSendThreadExceptions = true);
-    bool IsRunning() { return m_IsRunning.load(); }
-    bool WaitForPacketSent(uint32_t timeout);
-
 private:
-    void Send(IProfilingConnection& profilingConnection);
-
     template <typename ExceptionType>
     void CancelOperationAndThrow(const std::string& errorMessage)
     {
@@ -80,7 +55,7 @@
     {
         if (std::is_same<ExceptionType, armnn::profiling::BufferExhaustion>::value)
         {
-            SetReadyToRead();
+            m_BufferManager.FlushReadList();
         }
 
         if (writerBuffer != nullptr)
@@ -93,23 +68,7 @@
         throw ExceptionType(errorMessage);
     }
 
-    void FlushBuffer(IProfilingConnection& profilingConnection, bool notifyWatchers = true);
-
-    ProfilingStateMachine& m_StateMachine;
     IBufferManager& m_BufferManager;
-    int m_Timeout;
-    std::mutex m_WaitMutex;
-    std::condition_variable m_WaitCondition;
-    std::thread m_SendThread;
-    std::atomic<bool> m_IsRunning;
-    std::atomic<bool> m_KeepRunning;
-    // m_ReadyToRead will be protected by m_WaitMutex
-    bool m_ReadyToRead;
-    // m_PacketSent will be protected by m_PacketSentWaitMutex
-    bool m_PacketSent;
-    std::exception_ptr m_SendThreadException;
-    std::mutex m_PacketSentWaitMutex;
-    std::condition_variable m_PacketSentWaitCondition;
 
 protected:
     // Helper methods, protected for testing