IVGCVSW-3937 Refactor and improve the CommandHandleRegistry class

 * Added simplified RegisterFunctor method
 * Code refactoring
 * Updated the unit tests accordingly

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

1 files changed, 6 insertions, 21 deletions

diff --git a/src/profiling/CommandHandler.cpp b/src/profiling/CommandHandler.cpp
index 5eddfd5ec3..49784056bf 100644
--- a/src/profiling/CommandHandler.cpp
+++ b/src/profiling/CommandHandler.cpp
@@ -18,14 +18,14 @@ void CommandHandler::Start(IProfilingConnection& profilingConnection)
         return;
     }
 
-    m_IsRunning.store(true, std::memory_order_relaxed);
-    m_KeepRunning.store(true, std::memory_order_relaxed);
+    m_IsRunning.store(true);
+    m_KeepRunning.store(true);
     m_CommandThread = std::thread(&CommandHandler::HandleCommands, this, std::ref(profilingConnection));
 }
 
 void CommandHandler::Stop()
 {
-    m_KeepRunning.store(false, std::memory_order_relaxed);
+    m_KeepRunning.store(false);
 
     if (m_CommandThread.joinable())
     {
@@ -33,21 +33,6 @@ void CommandHandler::Stop()
     }
 }
 
-bool CommandHandler::IsRunning() const
-{
-    return m_IsRunning.load(std::memory_order_relaxed);
-}
-
-void CommandHandler::SetTimeout(uint32_t timeout)
-{
-    m_Timeout.store(timeout, std::memory_order_relaxed);
-}
-
-void CommandHandler::SetStopAfterTimeout(bool stopAfterTimeout)
-{
-    m_StopAfterTimeout.store(stopAfterTimeout, std::memory_order_relaxed);
-}
-
 void CommandHandler::HandleCommands(IProfilingConnection& profilingConnection)
 {
     do
@@ -72,12 +57,12 @@ void CommandHandler::HandleCommands(IProfilingConnection& profilingConnection)
         catch (...)
         {
             // Might want to differentiate the errors more
-            m_KeepRunning.store(false, std::memory_order_relaxed);
+            m_KeepRunning.store(false);
         }
     }
-    while (m_KeepRunning.load(std::memory_order_relaxed));
+    while (m_KeepRunning.load());
 
-    m_IsRunning.store(false, std::memory_order_relaxed);
+    m_IsRunning.store(false);
 }
 
 } // namespace profiling