Merged in bartosz_szreder/tracy (pull request #3)

Split data handling code from the view.

AUTHORS

@@ -1,2 +1,3 @@
 Bartosz Taudul <wolf.pld@gmail.com>
 Kamil Klimek <kamil.klimek@sharkbits.com>
+Bartosz Szreder <zgredder@gmail.com>

common/TracySocket.cpp

@@ -154,7 +154,7 @@ int Socket::Recv( void* _buf, int len, const timeval* tv )
     }
 }
 
-bool Socket::Read( void* _buf, int len, const timeval* tv, bool(*exitCb)() )
+bool Socket::Read( void* _buf, int len, const timeval* tv, std::function< bool() > exitCb )
 {
     auto buf = (char*)_buf;
 

common/TracySocket.hpp

@@ -1,6 +1,8 @@
 #ifndef __TRACYSOCKET_HPP__
 #define __TRACYSOCKET_HPP__
 
+#include <functional>
+
 struct timeval;
 
 namespace tracy
@@ -19,7 +21,7 @@ public:
     int Send( const void* buf, int len );
     int Recv( void* buf, int len, const timeval* tv );
 
-    bool Read( void* buf, int len, const timeval* tv, bool(*exitCb)() );
+    bool Read( void* buf, int len, const timeval* tv, std::function< bool() > exitCb );
     bool HasData();
 
     Socket( const Socket& ) = delete;

server/TracyEvent.hpp

@@ -155,8 +155,6 @@ struct ThreadData
 {
     uint64_t id;
     uint64_t count;
-    bool showFull;
-    bool visible;
     Vector<ZoneEvent*> timeline;
     Vector<ZoneEvent*> stack;
     Vector<MessageData*> messages;
@@ -178,8 +176,6 @@ struct GpuCtxData
     Vector<GpuEvent*> queue;
     Vector<GpuCtxResync> resync;
     uint8_t accuracyBits;
-    bool showFull;
-    bool visible;
 };
 
 struct LockMap
@@ -189,7 +185,6 @@ struct LockMap
     std::unordered_map<uint64_t, uint8_t> threadMap;
     std::vector<uint64_t> threadList;
     LockType type;
-    bool visible;
     bool valid;
 };
 
@@ -213,8 +208,6 @@ struct PlotData
     uint64_t name;
     double min;
     double max;
-    bool showFull;
-    bool visible;
     Vector<PlotItem> data;
     Vector<PlotItem> postpone;
     uint64_t postponeTime;

server/TracyVector.hpp

@@ -21,6 +21,7 @@ class Vector
 {
 public:
     using iterator = T*;
+    using const_iterator = const T*;
 
     Vector()
         : m_ptr( nullptr )

server/TracyView.hpp

@@ -8,13 +8,8 @@
 #include <unordered_map>
 #include <vector>
 
-#include "../common/tracy_lz4.hpp"
-#include "../common/TracySocket.hpp"
-#include "../common/TracyQueue.hpp"
-#include "TracyCharUtil.hpp"
-#include "TracyEvent.hpp"
-#include "TracySlab.hpp"
 #include "TracyVector.hpp"
+#include "TracyWorker.hpp"
 #include "tracy_benaphore.h"
 #include "tracy_flat_hash_map.hpp"
 
@@ -25,17 +20,9 @@ namespace tracy
 
 struct QueueItem;
 class FileRead;
-class FileWrite;
 
 class View
 {
-    template<typename T>
-    struct nohash
-    {
-        size_t operator()( const T& v ) { return (size_t)v; }
-        typedef tracy::power_of_two_hash_policy hash_policy;
-    };
-
     struct Animation
     {
         bool active = false;
@@ -51,7 +38,6 @@ public:
     View( FileRead& f );
     ~View();
 
-    static bool ShouldExit();
     static void Draw();
 
 private:
@@ -62,76 +48,6 @@ private:
         Short
     };
 
-    void Worker();
-
-    tracy_force_inline void DispatchProcess( const QueueItem& ev, char*& ptr );
-
-    void ServerQuery( uint8_t type, uint64_t data );
-
-    tracy_force_inline void Process( const QueueItem& ev );
-    tracy_force_inline void ProcessZoneBegin( const QueueZoneBegin& ev );
-    tracy_force_inline void ProcessZoneBeginAllocSrcLoc( const QueueZoneBegin& ev );
-    tracy_force_inline void ProcessZoneEnd( const QueueZoneEnd& ev );
-    tracy_force_inline void ProcessFrameMark( const QueueFrameMark& ev );
-    tracy_force_inline void ProcessZoneText( const QueueZoneText& ev );
-    tracy_force_inline void ProcessLockAnnounce( const QueueLockAnnounce& ev );
-    tracy_force_inline void ProcessLockWait( const QueueLockWait& ev );
-    tracy_force_inline void ProcessLockObtain( const QueueLockObtain& ev );
-    tracy_force_inline void ProcessLockRelease( const QueueLockRelease& ev );
-    tracy_force_inline void ProcessLockSharedWait( const QueueLockWait& ev );
-    tracy_force_inline void ProcessLockSharedObtain( const QueueLockObtain& ev );
-    tracy_force_inline void ProcessLockSharedRelease( const QueueLockRelease& ev );
-    tracy_force_inline void ProcessLockMark( const QueueLockMark& ev );
-    tracy_force_inline void ProcessPlotData( const QueuePlotData& ev );
-    tracy_force_inline void ProcessMessage( const QueueMessage& ev );
-    tracy_force_inline void ProcessMessageLiteral( const QueueMessage& ev );
-    tracy_force_inline void ProcessGpuNewContext( const QueueGpuNewContext& ev );
-    tracy_force_inline void ProcessGpuZoneBegin( const QueueGpuZoneBegin& ev );
-    tracy_force_inline void ProcessGpuZoneEnd( const QueueGpuZoneEnd& ev );
-    tracy_force_inline void ProcessGpuTime( const QueueGpuTime& ev );
-    tracy_force_inline void ProcessGpuResync( const QueueGpuResync& ev );
-
-    void CheckString( uint64_t ptr );
-    void CheckThreadString( uint64_t id );
-
-    tracy_force_inline void CheckSourceLocation( uint64_t ptr );
-    void NewSourceLocation( uint64_t ptr );
-
-    void AddString( uint64_t ptr, char* str, size_t sz );
-    void AddThreadString( uint64_t id, char* str, size_t sz );
-    void AddCustomString( uint64_t ptr, char* str, size_t sz );
-    void AddSourceLocation( const QueueSourceLocation& srcloc );
-    void AddSourceLocationPayload( uint64_t ptr, char* data, size_t sz );
-
-    StringLocation StoreString( char* str, size_t sz );
-
-    tracy_force_inline uint32_t ShrinkSourceLocation( uint64_t srcloc );
-    uint32_t NewShrinkedSourceLocation( uint64_t srcloc );
-
-    void InsertMessageData( MessageData* msg, uint64_t thread );
-
-    tracy_force_inline ThreadData* NoticeThread( uint64_t thread );
-    ThreadData* NewThread( uint64_t thread );
-
-    tracy_force_inline void NewZone( ZoneEvent* zone, uint64_t thread );
-
-    void InsertLockEvent( LockMap& lockmap, LockEvent* lev, uint64_t thread );
-
-    void InsertPlot( PlotData* plot, int64_t time, double val );
-    void HandlePlotName( uint64_t name, char* str, size_t sz );
-    void HandlePostponedPlots();
-
-    int64_t GetFrameTime( size_t idx ) const;
-    int64_t GetFrameBegin( size_t idx ) const;
-    int64_t GetFrameEnd( size_t idx ) const;
-    int64_t GetZoneEnd( const ZoneEvent& ev ) const;
-    int64_t GetZoneEnd( const GpuEvent& ev ) const;
-    const char* GetString( uint64_t ptr ) const;
-    const char* GetString( const StringRef& ref ) const;
-    const char* GetString( const StringIdx& idx ) const;
-    const char* GetThreadString( uint64_t id ) const;
-    const SourceLocation& GetSourceLocation( int32_t srcloc ) const;
-
     const char* ShortenNamespace( const char* name ) const;
 
     void DrawHelpMarker( const char* desc ) const;
@@ -177,69 +93,33 @@ private:
     void FindZones();
     void FindZones( const Vector<ZoneEvent*> &events, Vector<ZoneEvent*> &out, const int maxdepth = 0 );
 
-    void Write( FileWrite& f );
+    template <typename T>
-    void WriteTimeline( FileWrite& f, const Vector<ZoneEvent*>& vec );
+    bool& Visible( const T* ptr )
-    void WriteTimeline( FileWrite& f, const Vector<GpuEvent*>& vec );
+    {
-    void ReadTimeline( FileRead& f, Vector<ZoneEvent*>& vec );
+        static std::map <const T*, bool> visible;
-    void ReadTimeline( FileRead& f, Vector<GpuEvent*>& vec );
+        if( visible.find( ptr ) == visible.end() )
+        {
+            visible[ptr] = true;
+        }
 
-    int64_t TscTime( int64_t tsc ) { return int64_t( tsc * m_timerMul ); }
+        return visible[ptr];
-    int64_t TscTime( uint64_t tsc ) { return int64_t( tsc * m_timerMul ); }
+    }
 
-    std::string m_addr;
+    template <typename T>
+    bool& ShowFull( const T* ptr )
+    {
+        static std::map <const T*, bool> showFull;
+        if( showFull.find( ptr ) == showFull.end() )
+        {
+            showFull[ptr] = true;
+        }
 
-    Socket m_sock;
+        return showFull[ptr];
-    std::thread m_thread;
+    }
-    std::atomic<bool> m_shutdown;
+
-    std::atomic<bool> m_connected;
+    Worker m_worker;
-    std::atomic<bool> m_hasData;
     bool m_staticView;
 
-    // this block must be locked
-    NonRecursiveBenaphore m_lock;
-    Vector<int64_t> m_frames;
-    Vector<ThreadData*> m_threads;
-    Vector<PlotData*> m_plots;
-    Vector<MessageData*> m_messages;
-    Vector<GpuCtxData*> m_gpuData;
-    flat_hash_map<uint64_t, const char*, nohash<uint64_t>> m_strings;
-    flat_hash_map<uint64_t, const char*, nohash<uint64_t>> m_threadNames;
-    flat_hash_map<uint64_t, SourceLocation, nohash<uint64_t>> m_sourceLocation;
-    std::vector<uint64_t> m_sourceLocationExpand;
-    std::map<uint32_t, LockMap> m_lockMap;
-    uint64_t m_zonesCnt;
-
-    Vector<const char*> m_stringData;
-    std::unordered_map<const char*, uint32_t, charutil::Hasher, charutil::Comparator> m_stringMap;
-
-    Vector<SourceLocation*> m_sourceLocationPayload;
-    flat_hash_map<SourceLocation*, uint32_t, SourceLocationHasher, SourceLocationComparator> m_sourceLocationPayloadMap;
-
-    NonRecursiveBenaphore m_mbpslock;
-    std::vector<float> m_mbps;
-    float m_compRatio;
-
-    // not used for vis - no need to lock
-    flat_hash_map<uint64_t, StringLocation, nohash<uint64_t>> m_pendingCustomStrings;
-    flat_hash_map<uint64_t, ThreadData*, nohash<uint64_t>> m_threadMap;
-    flat_hash_map<uint16_t, GpuCtxData*, nohash<uint16_t>> m_gpuCtxMap;
-    flat_hash_map<uint64_t, PlotData*, nohash<uint64_t>> m_plotMap;
-    std::unordered_map<const char*, PlotData*, charutil::Hasher, charutil::Comparator> m_plotRev;
-    flat_hash_map<uint64_t, PlotData*, nohash<uint64_t>> m_pendingPlots;
-    flat_hash_map<uint64_t, uint32_t, nohash<uint64_t>> m_sourceLocationShrink;
-    flat_hash_map<uint64_t, int32_t, nohash<uint64_t>> m_pendingSourceLocationPayload;
-    Vector<uint64_t> m_sourceLocationQueue;
-
-    uint32_t m_pendingStrings;
-    uint32_t m_pendingThreads;
-    uint32_t m_pendingSourceLocation;
-
-    Slab<64*1024*1024> m_slab;
-
-    LZ4_streamDecode_t* m_stream;
-    char* m_buffer;
-    int m_bufferOffset;
-
     int m_frameScale;
     bool m_pause;
     int m_frameStart;
@@ -248,11 +128,6 @@ private:
     int64_t m_zvEnd;
     int64_t m_lastTime;
 
-    int64_t m_delay;
-    int64_t m_resolution;
-    double m_timerMul;
-    std::string m_captureName;
-
     int8_t m_lastCpu;
 
     int m_zvHeight;
@@ -294,8 +169,6 @@ private:
         bool logVal = false;
         bool logTime = false;
     } m_findZone;
-
-    bool m_terminate;
 };
 
 }

server/TracyWorker.hpp

@@ -0,0 +1,220 @@
+#ifndef __TRACYWORKER_HPP__
+#define __TRACYWORKER_HPP__
+
+#include <atomic>
+#include <map>
+#include <string>
+#include <thread>
+#include <unordered_map>
+#include <vector>
+
+#include "../common/tracy_lz4.hpp"
+#include "../common/TracyForceInline.hpp"
+#include "../common/TracyQueue.hpp"
+#include "../common/TracySocket.hpp"
+#include "tracy_benaphore.h"
+#include "tracy_flat_hash_map.hpp"
+#include "TracyEvent.hpp"
+#include "TracySlab.hpp"
+
+namespace tracy
+{
+
+class FileRead;
+class FileWrite;
+
+template<typename T>
+struct nohash
+{
+    size_t operator()( const T& v ) { return (size_t)v; }
+    typedef tracy::power_of_two_hash_policy hash_policy;
+};
+
+class Worker
+{
+    struct DataBlock
+    {
+        DataBlock() : zonesCnt( 0 ), lastTime( 0 ) {}
+
+        NonRecursiveBenaphore lock;
+        Vector<int64_t> frames;
+        Vector<GpuCtxData*> gpuData;
+        Vector<MessageData*> messages;
+        Vector<PlotData*> plots;
+        Vector<ThreadData*> threads;
+        uint64_t zonesCnt;
+        int64_t lastTime;
+
+        flat_hash_map<uint64_t, const char*, nohash<uint64_t>> strings;
+        Vector<const char*> stringData;
+        std::unordered_map<const char*, uint32_t, charutil::Hasher, charutil::Comparator> stringMap;
+        flat_hash_map<uint64_t, const char*, nohash<uint64_t>> threadNames;
+
+        flat_hash_map<uint64_t, SourceLocation, nohash<uint64_t>> sourceLocation;
+        Vector<SourceLocation*> sourceLocationPayload;
+        flat_hash_map<SourceLocation*, uint32_t, SourceLocationHasher, SourceLocationComparator> sourceLocationPayloadMap;
+        std::vector<uint64_t> sourceLocationExpand;
+
+        std::map<uint32_t, LockMap> lockMap;
+    };
+
+    struct MbpsBlock
+    {
+        MbpsBlock() : mbps( 64 ), compRatio( 1.0 ) {}
+
+        NonRecursiveBenaphore lock;
+        std::vector<float> mbps;
+        float compRatio;
+    };
+
+public:
+    Worker( const char* addr );
+    Worker( FileRead& f );
+    ~Worker();
+
+    const std::string& GetAddr() const { return m_addr; }
+    const std::string& GetCaptureName() const { return m_captureName; }
+    int64_t GetDelay() const { return m_delay; }
+    int64_t GetResolution() const { return m_resolution; }
+
+    NonRecursiveBenaphore& GetDataLock() { return m_data.lock; }
+    size_t GetFrameCount() const { return m_data.frames.size(); }
+    int64_t GetLastTime() const { return m_data.lastTime; }
+    uint64_t GetZoneCount() const { return m_data.zonesCnt; }
+
+    int64_t GetFrameTime( size_t idx ) const;
+    int64_t GetFrameBegin( size_t idx ) const;
+    int64_t GetFrameEnd( size_t idx ) const;
+    std::pair <int, int> GetFrameRange( int64_t from, int64_t to );
+
+    const std::map<uint32_t, LockMap>& GetLockMap() const { return m_data.lockMap; }
+    const Vector<MessageData*>& GetMessages() const { return m_data.messages; }
+    const Vector<GpuCtxData*>& GetGpuData() const { return m_data.gpuData; }
+    const Vector<PlotData*>& GetPlots() const { return m_data.plots; }
+    const Vector<ThreadData*>& GetThreadData() const { return m_data.threads; }
+
+    int64_t GetZoneEnd( const ZoneEvent& ev ) const;
+    int64_t GetZoneEnd( const GpuEvent& ev ) const;
+    const char* GetString( uint64_t ptr ) const;
+    const char* GetString( const StringRef& ref ) const;
+    const char* GetString( const StringIdx& idx ) const;
+    const char* GetThreadString( uint64_t id ) const;
+    const SourceLocation& GetSourceLocation( int32_t srcloc ) const;
+
+    NonRecursiveBenaphore& GetMbpsDataLock() { return m_mbpsData.lock; }
+    const std::vector<float>& GetMbpsData() const { return m_mbpsData.mbps; }
+    float GetCompRatio() const { return m_mbpsData.compRatio; }
+
+    bool HasData() const { return m_hasData.load( std::memory_order_acquire ); }
+    bool IsConnected() const { return m_connected.load( std::memory_order_relaxed ); }
+    void Shutdown() { m_shutdown.store( true, std::memory_order_relaxed ); }
+
+    void Write( FileWrite& f );
+
+private:
+    void Exec();
+    void ServerQuery( uint8_t type, uint64_t data );
+
+    tracy_force_inline void DispatchProcess( const QueueItem& ev, char*& ptr );
+    tracy_force_inline void Process( const QueueItem& ev );
+    tracy_force_inline void ProcessZoneBegin( const QueueZoneBegin& ev );
+    tracy_force_inline void ProcessZoneBeginAllocSrcLoc( const QueueZoneBegin& ev );
+    tracy_force_inline void ProcessZoneEnd( const QueueZoneEnd& ev );
+    tracy_force_inline void ProcessFrameMark( const QueueFrameMark& ev );
+    tracy_force_inline void ProcessZoneText( const QueueZoneText& ev );
+    tracy_force_inline void ProcessLockAnnounce( const QueueLockAnnounce& ev );
+    tracy_force_inline void ProcessLockWait( const QueueLockWait& ev );
+    tracy_force_inline void ProcessLockObtain( const QueueLockObtain& ev );
+    tracy_force_inline void ProcessLockRelease( const QueueLockRelease& ev );
+    tracy_force_inline void ProcessLockSharedWait( const QueueLockWait& ev );
+    tracy_force_inline void ProcessLockSharedObtain( const QueueLockObtain& ev );
+    tracy_force_inline void ProcessLockSharedRelease( const QueueLockRelease& ev );
+    tracy_force_inline void ProcessLockMark( const QueueLockMark& ev );
+    tracy_force_inline void ProcessPlotData( const QueuePlotData& ev );
+    tracy_force_inline void ProcessMessage( const QueueMessage& ev );
+    tracy_force_inline void ProcessMessageLiteral( const QueueMessage& ev );
+    tracy_force_inline void ProcessGpuNewContext( const QueueGpuNewContext& ev );
+    tracy_force_inline void ProcessGpuZoneBegin( const QueueGpuZoneBegin& ev );
+    tracy_force_inline void ProcessGpuZoneEnd( const QueueGpuZoneEnd& ev );
+    tracy_force_inline void ProcessGpuTime( const QueueGpuTime& ev );
+    tracy_force_inline void ProcessGpuResync( const QueueGpuResync& ev );
+
+    tracy_force_inline void CheckSourceLocation( uint64_t ptr );
+    void NewSourceLocation( uint64_t ptr );
+    tracy_force_inline uint32_t ShrinkSourceLocation( uint64_t srcloc );
+    uint32_t NewShrinkedSourceLocation( uint64_t srcloc );
+
+    void InsertMessageData( MessageData* msg, uint64_t thread );
+
+    ThreadData* NewThread( uint64_t thread );
+    ThreadData* NoticeThread( uint64_t thread );
+
+    tracy_force_inline void NewZone( ZoneEvent* zone, uint64_t thread );
+
+    void InsertLockEvent( LockMap& lockmap, LockEvent* lev, uint64_t thread );
+
+    void CheckString( uint64_t ptr );
+    void CheckThreadString( uint64_t id );
+
+    void AddSourceLocation( const QueueSourceLocation& srcloc );
+    void AddSourceLocationPayload( uint64_t ptr, char* data, size_t sz );
+
+    void AddString( uint64_t ptr, char* str, size_t sz );
+    void AddThreadString( uint64_t id, char* str, size_t sz );
+    void AddCustomString( uint64_t ptr, char* str, size_t sz );
+
+    void InsertPlot( PlotData* plot, int64_t time, double val );
+    void HandlePlotName( uint64_t name, char* str, size_t sz );
+    void HandlePostponedPlots();
+
+    StringLocation StoreString( char* str, size_t sz );
+
+    void ReadTimeline( FileRead& f, Vector<ZoneEvent*>& vec );
+    void ReadTimeline( FileRead& f, Vector<GpuEvent*>& vec );
+
+    void WriteTimeline( FileWrite& f, const Vector<ZoneEvent*>& vec );
+    void WriteTimeline( FileWrite& f, const Vector<GpuEvent*>& vec );
+
+    int64_t TscTime( int64_t tsc ) { return int64_t( tsc * m_timerMul ); }
+    int64_t TscTime( uint64_t tsc ) { return int64_t( tsc * m_timerMul ); }
+
+    Socket m_sock;
+    std::string m_addr;
+
+    std::thread m_thread;
+    std::atomic<bool> m_connected;
+    std::atomic<bool> m_hasData;
+    std::atomic<bool> m_shutdown;
+
+    int64_t m_delay;
+    int64_t m_resolution;
+    double m_timerMul;
+    std::string m_captureName;
+    bool m_terminate;
+    LZ4_streamDecode_t* m_stream;
+    char* m_buffer;
+    int m_bufferOffset;
+
+    flat_hash_map<uint16_t, GpuCtxData*, nohash<uint16_t>> m_gpuCtxMap;
+    flat_hash_map<uint64_t, StringLocation, nohash<uint64_t>> m_pendingCustomStrings;
+    flat_hash_map<uint64_t, PlotData*, nohash<uint64_t>> m_pendingPlots;
+    flat_hash_map<uint64_t, PlotData*, nohash<uint64_t>> m_plotMap;
+    std::unordered_map<const char*, PlotData*, charutil::Hasher, charutil::Comparator> m_plotRev;
+    flat_hash_map<uint64_t, int32_t, nohash<uint64_t>> m_pendingSourceLocationPayload;
+    Vector<uint64_t> m_sourceLocationQueue;
+    flat_hash_map<uint64_t, uint32_t, nohash<uint64_t>> m_sourceLocationShrink;
+    flat_hash_map<uint64_t, ThreadData*, nohash<uint64_t>> m_threadMap;
+
+    uint32_t m_pendingStrings;
+    uint32_t m_pendingThreads;
+    uint32_t m_pendingSourceLocation;
+
+    Slab<64*1024*1024> m_slab;
+
+    DataBlock m_data;
+    MbpsBlock m_mbpsData;
+};
+
+}
+
+#endif

standalone/build/win32/Tracy.vcxproj

@@ -91,6 +91,7 @@
     <ClCompile Include="..\..\..\nfd\nfd_win.cpp" />
     <ClCompile Include="..\..\..\server\TracyMemory.cpp" />
     <ClCompile Include="..\..\..\server\TracyView.cpp" />
+    <ClCompile Include="..\..\..\server\TracyWorker.cpp" />
     <ClCompile Include="..\..\libs\gl3w\GL\gl3w.c" />
     <ClCompile Include="..\..\src\imgui_impl_glfw_gl3.cpp" />
     <ClCompile Include="..\..\src\main.cpp" />

standalone/build/win32/Tracy.vcxproj.filters

@@ -33,6 +33,9 @@
     <ClCompile Include="..\..\..\server\TracyView.cpp">
       <Filter>server</Filter>
     </ClCompile>
+    <ClCompile  Include="..\..\..\server\TracyWorker.cpp">
+      <Filter>server</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\src\imgui_impl_glfw_gl3.cpp">
       <Filter>src</Filter>
     </ClCompile>