From 03f46d7228d65c29245585a00614ea1323785ff8 Mon Sep 17 00:00:00 2001
From: Bartosz Taudul <wolf.pld@gmail.com>
Date: Sun, 26 Jul 2020 01:35:08 +0200
Subject: [PATCH] Custom string data is no longer needed.

---
 client/TracyProfiler.cpp |  1 -
 common/TracyQueue.hpp    |  2 --
 server/TracyWorker.cpp   | 18 ++++--------------
 server/TracyWorker.hpp   |  2 --
 4 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/client/TracyProfiler.cpp b/client/TracyProfiler.cpp
index 156dfccf..5bd1414b 100644
--- a/client/TracyProfiler.cpp
+++ b/client/TracyProfiler.cpp
@@ -2229,7 +2229,6 @@ void Profiler::SendString( uint64_t str, const char* ptr, size_t len, QueueType
 {
     assert( type == QueueType::StringData ||
             type == QueueType::ThreadName ||
-            type == QueueType::CustomStringData ||
             type == QueueType::PlotName ||
             type == QueueType::FrameName ||
             type == QueueType::ExternalName ||
diff --git a/common/TracyQueue.hpp b/common/TracyQueue.hpp
index a05b4c4e..187d4351 100644
--- a/common/TracyQueue.hpp
+++ b/common/TracyQueue.hpp
@@ -87,7 +87,6 @@ enum class QueueType : uint8_t
     SecondStringData,
     StringData,
     ThreadName,
-    CustomStringData,
     PlotName,
     SourceLocationPayload,
     CallstackPayload,
@@ -629,7 +628,6 @@ static constexpr size_t QueueDataSize[] = {
     // keep all QueueStringTransfer below
     sizeof( QueueHeader ) + sizeof( QueueStringTransfer ),  // string data
     sizeof( QueueHeader ) + sizeof( QueueStringTransfer ),  // thread name
-    sizeof( QueueHeader ) + sizeof( QueueStringTransfer ),  // custom string data
     sizeof( QueueHeader ) + sizeof( QueueStringTransfer ),  // plot name
     sizeof( QueueHeader ) + sizeof( QueueStringTransfer ),  // allocated source location payload
     sizeof( QueueHeader ) + sizeof( QueueStringTransfer ),  // callstack payload
diff --git a/server/TracyWorker.cpp b/server/TracyWorker.cpp
index e133fb37..b82c9793 100644
--- a/server/TracyWorker.cpp
+++ b/server/TracyWorker.cpp
@@ -2669,11 +2669,10 @@ void Worker::Exec()
         if( m_terminate )
         {
             if( m_pendingStrings != 0 || m_pendingThreads != 0 || m_pendingSourceLocation != 0 || m_pendingCallstackFrames != 0 ||
-                !m_pendingCustomStrings.empty() || m_data.plots.IsPending() || m_pendingCallstackPtr != 0 ||
-                m_pendingExternalNames != 0 || m_pendingCallstackSubframes != 0 || m_pendingFrameImageData.image != nullptr ||
-                !m_pendingSymbols.empty() || !m_pendingSymbolCode.empty() || m_pendingCodeInformation != 0 ||
-                !m_serverQueryQueue.empty() || m_pendingSourceLocationPayload != 0 || m_pendingSingleString.ptr != nullptr ||
-                m_pendingSecondString.ptr != nullptr )
+                m_data.plots.IsPending() || m_pendingCallstackPtr != 0 || m_pendingExternalNames != 0 ||
+                m_pendingCallstackSubframes != 0 || m_pendingFrameImageData.image != nullptr || !m_pendingSymbols.empty() ||
+                !m_pendingSymbolCode.empty() || m_pendingCodeInformation != 0 || !m_serverQueryQueue.empty() ||
+                m_pendingSourceLocationPayload != 0 || m_pendingSingleString.ptr != nullptr || m_pendingSecondString.ptr != nullptr )
             {
                 continue;
             }
@@ -2899,9 +2898,6 @@ bool Worker::DispatchProcess( const QueueItem& ev, const char*& ptr )
             ptr += sizeof( sz );
             switch( ev.hdr.type )
             {
-            case QueueType::CustomStringData:
-                AddCustomString( ev.stringTransfer.ptr, ptr, sz );
-                break;
             case QueueType::StringData:
                 AddString( ev.stringTransfer.ptr, ptr, sz );
                 m_serverQuerySpaceLeft++;
@@ -3364,12 +3360,6 @@ void Worker::AddThreadString( uint64_t id, const char* str, size_t sz )
     it->second = sl.ptr;
 }
 
-void Worker::AddCustomString( uint64_t ptr, const char* str, size_t sz )
-{
-    assert( m_pendingCustomStrings.find( ptr ) == m_pendingCustomStrings.end() );
-    m_pendingCustomStrings.emplace( ptr, StoreString( str, sz ) );
-}
-
 void Worker::AddSingleString( const char* str, size_t sz )
 {
     assert( m_pendingSingleString.ptr == nullptr );
diff --git a/server/TracyWorker.hpp b/server/TracyWorker.hpp
index 2713277b..fdea775a 100644
--- a/server/TracyWorker.hpp
+++ b/server/TracyWorker.hpp
@@ -737,7 +737,6 @@ private:
 
     void AddString( uint64_t ptr, const char* str, size_t sz );
     void AddThreadString( uint64_t id, const char* str, size_t sz );
-    void AddCustomString( uint64_t ptr, const char* str, size_t sz );
     void AddSingleString( const char* str, size_t sz );
     void AddSecondString( const char* str, size_t sz );
     void AddExternalName( uint64_t ptr, const char* str, size_t sz );
@@ -847,7 +846,6 @@ private:
     bool m_ignoreMemFreeFaults;
 
     short_ptr<GpuCtxData> m_gpuCtxMap[256];
-    unordered_flat_map<uint64_t, StringLocation> m_pendingCustomStrings;
     uint64_t m_pendingCallstackPtr = 0;
     uint32_t m_pendingCallstackId;
     int16_t m_pendingSourceLocationPayload = 0;