From c0b524d8de5af147a3f5c8ccb0180738be30953d Mon Sep 17 00:00:00 2001
From: Bartosz Taudul <wolf.pld@gmail.com>
Date: Wed, 14 Aug 2019 22:39:12 +0200
Subject: [PATCH] Add a separate method for clearing serial queue.

---
 client/TracyProfiler.cpp | 29 ++++++++++++++++-------------
 client/TracyProfiler.hpp |  1 +
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/client/TracyProfiler.cpp b/client/TracyProfiler.cpp
index 5689a6a5..d18199f1 100644
--- a/client/TracyProfiler.cpp
+++ b/client/TracyProfiler.cpp
@@ -1614,23 +1614,26 @@ void Profiler::ClearQueues( moodycamel::ConsumerToken& token )
         for( size_t i=0; i<sz; i++ ) FreeAssociatedMemory( m_itemBuf[i] );
     }
 
+    ClearSerial();
+}
+
+void Profiler::ClearSerial()
+{
+    bool lockHeld = true;
+    while( !m_serialLock.try_lock() )
     {
-        bool lockHeld = true;
-        while( !m_serialLock.try_lock() )
+        if( m_shutdownManual.load( std::memory_order_relaxed ) )
         {
-            if( m_shutdownManual.load( std::memory_order_relaxed ) )
-            {
-                lockHeld = false;
-                break;
-            }
-        }
-        for( auto& v : m_serialQueue ) FreeAssociatedMemory( v );
-        m_serialQueue.clear();
-        if( lockHeld )
-        {
-            m_serialLock.unlock();
+            lockHeld = false;
+            break;
         }
     }
+    for( auto& v : m_serialQueue ) FreeAssociatedMemory( v );
+    m_serialQueue.clear();
+    if( lockHeld )
+    {
+        m_serialLock.unlock();
+    }
 
     for( auto& v : m_serialDequeue ) FreeAssociatedMemory( v );
     m_serialDequeue.clear();
diff --git a/client/TracyProfiler.hpp b/client/TracyProfiler.hpp
index 97bf3890..a7b95314 100644
--- a/client/TracyProfiler.hpp
+++ b/client/TracyProfiler.hpp
@@ -452,6 +452,7 @@ private:
     void CompressWorker();
 
     void ClearQueues( tracy::moodycamel::ConsumerToken& token );
+    void ClearSerial();
     DequeueStatus Dequeue( tracy::moodycamel::ConsumerToken& token );
     DequeueStatus DequeueSerial();
     bool AppendData( const void* data, size_t len );