Add support for discontinuous frames.

Tracy.hpp

@@ -21,6 +21,8 @@
 
 #define FrameMark
 #define FrameMarkNamed(x)
+#define FrameMarkStart(x)
+#define FrameMarkEnd(x)
 
 #define TracyLockable( type, varname ) type varname;
 #define TracyLockableN( type, varname, desc ) type varname;
@@ -71,7 +73,9 @@
 #define ZoneName( txt, size ) ___tracy_scoped_zone.Name( txt, size );
 
 #define FrameMark tracy::Profiler::SendFrameMark();
-#define FrameMarkNamed( name ) tracy::Profiler::SendFrameMark( name );
+#define FrameMarkNamed( name ) tracy::Profiler::SendFrameMark( name, tracy::QueueType::FrameMarkMsg );
+#define FrameMarkStart( name ) tracy::Profiler::SendFrameMark( name, tracy::QueueType::FrameMarkMsgStart );
+#define FrameMarkEnd( name ) tracy::Profiler::SendFrameMark( name, tracy::QueueType::FrameMarkMsgEnd );
 
 #define TracyLockable( type, varname ) tracy::Lockable<type> varname { [] () -> const tracy::SourceLocationData* { static const tracy::SourceLocationData srcloc { nullptr, #type " " #varname, __FILE__, __LINE__, 0 }; return &srcloc; }() };
 #define TracyLockableN( type, varname, desc ) tracy::Lockable<type> varname { [] () -> const tracy::SourceLocationData* { static const tracy::SourceLocationData srcloc { nullptr, desc, __FILE__, __LINE__, 0 }; return &srcloc; }() };

client/TracyProfiler.hpp

@@ -1,6 +1,7 @@
 #ifndef __TRACYPROFILER_HPP__
 #define __TRACYPROFILER_HPP__
 
+#include <assert.h>
 #include <atomic>
 #include <chrono>
 #include <stdint.h>
@@ -143,8 +144,9 @@ public:
         tail.store( magic + 1, std::memory_order_release );
     }
 
-    static tracy_force_inline void SendFrameMark( const char* name )
+    static tracy_force_inline void SendFrameMark( const char* name, QueueType type )
     {
+        assert( type == QueueType::FrameMarkMsg || type == QueueType::FrameMarkMsgStart || type == QueueType::FrameMarkMsgEnd );
 #ifdef TRACY_ON_DEMAND
         if( !s_profiler.IsConnected() ) return;
 #endif
@@ -152,7 +154,7 @@ public:
         auto& token = s_token.ptr;
         auto& tail = token->get_tail_index();
         auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
-        MemWrite( &item->hdr.type, QueueType::FrameMarkMsg );
+        MemWrite( &item->hdr.type, type );
         MemWrite( &item->frameMark.time, GetTime() );
         MemWrite( &item->frameMark.name, uint64_t( name ) );
         tail.store( magic + 1, std::memory_order_release );

common/TracyQueue.hpp

@@ -20,6 +20,8 @@ enum class QueueType : uint8_t
     ZoneBeginCallstack,
     ZoneEnd,
     FrameMarkMsg,
+    FrameMarkMsgStart,
+    FrameMarkMsgEnd,
     SourceLocation,
     LockAnnounce,
     LockWait,
@@ -288,7 +290,9 @@ static const size_t QueueDataSize[] = {
     sizeof( QueueHeader ) + sizeof( QueueZoneBegin ),
     sizeof( QueueHeader ) + sizeof( QueueZoneBegin ),       // callstack
     sizeof( QueueHeader ) + sizeof( QueueZoneEnd ),
-    sizeof( QueueHeader ) + sizeof( QueueFrameMark ),
+    sizeof( QueueHeader ) + sizeof( QueueFrameMark ),       // continuous frames
+    sizeof( QueueHeader ) + sizeof( QueueFrameMark ),       // start
+    sizeof( QueueHeader ) + sizeof( QueueFrameMark ),       // end
     sizeof( QueueHeader ) + sizeof( QueueSourceLocation ),
     sizeof( QueueHeader ) + sizeof( QueueLockAnnounce ),
     sizeof( QueueHeader ) + sizeof( QueueLockWait ),

server/TracyEvent.hpp

@@ -255,10 +255,17 @@ struct MemData
     PlotData* plot = nullptr;
 };
 
+struct FrameEvent
+{
+    int64_t start;
+    int64_t end;
+};
+
 struct FrameData
 {
     uint64_t name;
-    Vector<int64_t> frames;
+    Vector<FrameEvent> frames;
+    uint8_t continuous;
 };
 
 struct StringLocation

server/TracyWorker.cpp

@@ -284,10 +284,22 @@ Worker::Worker( FileRead& f, EventType::Type eventMask )
         {
             auto ptr = m_slab.AllocInit<FrameData>();
             f.Read( &ptr->name, sizeof( ptr->name ) );
+            f.Read( &ptr->continuous, sizeof( ptr->continuous ) );
             uint64_t fsz;
             f.Read( &fsz, sizeof( fsz ) );
             ptr->frames.reserve_and_use( fsz );
-            f.Read( ptr->frames.data(), sizeof( int64_t ) * fsz );
+            if( ptr->continuous )
+            {
+                for( uint64_t i=0; i<fsz; i++ )
+                {
+                    f.Read( &ptr->frames[i].start, sizeof( int64_t ) );
+                    ptr->frames[i].end = -1;
+                }
+            }
+            else
+            {
+                f.Read( ptr->frames.data(), sizeof( FrameEvent ) * fsz );
+            }
             m_data.frames.Data()[i] = ptr;
         }
 
@@ -298,9 +310,14 @@ Worker::Worker( FileRead& f, EventType::Type eventMask )
     {
         auto ptr = m_slab.AllocInit<FrameData>();
         ptr->name = 0;
+        ptr->continuous = 1;
         f.Read( sz );
         ptr->frames.reserve_and_use( sz );
-        f.Read( ptr->frames.data(), sizeof( uint64_t ) * sz );
+        for( uint64_t i=0; i<sz; i++ )
+        {
+            f.Read( &ptr->frames[i].start, sizeof( int64_t ) );
+            ptr->frames[i].end = -1;
+        }
         m_data.frames.Data().push_back( ptr );
         m_data.framesBase = ptr;
     }
@@ -858,44 +875,72 @@ Worker::~Worker()
 
 int64_t Worker::GetFrameTime( const FrameData& fd, size_t idx ) const
 {
-    if( idx < fd.frames.size() - 1 )
+    if( fd.continuous )
     {
-        return fd.frames[idx+1] - fd.frames[idx];
+        if( idx < fd.frames.size() - 1 )
+        {
+            return fd.frames[idx+1].start - fd.frames[idx].start;
+        }
+        else
+        {
+            assert( m_data.lastTime != 0 );
+            return m_data.lastTime - fd.frames.back().start;
+        }
     }
     else
     {
-        assert( m_data.lastTime != 0 );
-        return m_data.lastTime - fd.frames.back();
+        if( fd.frames[idx].end >= 0 )
+        {
+            return fd.frames[idx].end - fd.frames[idx].start;
+        }
+        else
+        {
+            return m_data.lastTime - fd.frames.back().start;
+        }
     }
 }
 
 int64_t Worker::GetFrameBegin( const FrameData& fd, size_t idx ) const
 {
     assert( idx < fd.frames.size() );
-    return fd.frames[idx];
+    return fd.frames[idx].start;
 }
 
 int64_t Worker::GetFrameEnd( const FrameData& fd, size_t idx ) const
 {
-    if( idx < fd.frames.size() - 1 )
+    if( fd.continuous )
     {
-        return fd.frames[idx+1];
+        if( idx < fd.frames.size() - 1 )
+        {
+            return fd.frames[idx+1].start;
+        }
+        else
+        {
+            return m_data.lastTime;
+        }
     }
     else
     {
-        return m_data.lastTime;
+        if( fd.frames[idx].end >= 0 )
+        {
+            return fd.frames[idx].end;
+        }
+        else
+        {
+            return m_data.lastTime;
+        }
     }
 }
 
 std::pair <int, int> Worker::GetFrameRange( const FrameData& fd, int64_t from, int64_t to )
 {
-    auto zitbegin = std::lower_bound( fd.frames.begin(), fd.frames.end(), from );
+    auto zitbegin = std::lower_bound( fd.frames.begin(), fd.frames.end(), from, [] ( const auto& lhs, const auto& rhs ) { return lhs.start < rhs; } );
     if( zitbegin == fd.frames.end() ) zitbegin--;
 
-    const auto zitend = std::lower_bound( zitbegin, fd.frames.end(), to );
+    const auto zitend = std::lower_bound( zitbegin, fd.frames.end(), to, [] ( const auto& lhs, const auto& rhs ) { return lhs.start < rhs; } );
 
     int zbegin = std::distance( fd.frames.begin(), zitbegin );
-    if( zbegin > 0 && *zitbegin != from) --zbegin;
+    if( zbegin > 0 && zitbegin->start != from ) --zbegin;
     const int zend = std::distance( fd.frames.begin(), zitend );
 
     return std::make_pair( zbegin, zend );
@@ -1132,6 +1177,7 @@ void Worker::Exec()
         m_data.framesBase = m_data.frames.Retrieve( 0, [this] ( uint64_t name ) {
             auto fd = m_slab.AllocInit<FrameData>();
             fd->name = name;
+            fd->continuous = 1;
             return fd;
         }, [this] ( uint64_t name ) {
             assert( name == 0 );
@@ -1144,8 +1190,8 @@ void Worker::Exec()
             if( !m_sock.Read( &welcome, sizeof( welcome ), &tv, ShouldExit ) ) goto close;
             m_timerMul = welcome.timerMul;
             const auto initEnd = TscTime( welcome.initEnd );
-            m_data.framesBase->frames.push_back( TscTime( welcome.initBegin ) );
-            m_data.framesBase->frames.push_back( initEnd );
+            m_data.framesBase->frames.push_back( FrameEvent{ TscTime( welcome.initBegin ), -1 } );
+            m_data.framesBase->frames.push_back( FrameEvent{ initEnd, -1 } );
             m_data.lastTime = initEnd;
             m_delay = TscTime( welcome.delay );
             m_resolution = TscTime( welcome.resolution );
@@ -1672,7 +1718,7 @@ void Worker::HandleFrameName( uint64_t name, char* str, size_t sz )
     m_data.frames.StringDiscovered( name, sl, m_data.strings, [this] ( FrameData* dst, FrameData* src ) {
         auto sz = dst->frames.size();
         dst->frames.insert( dst->frames.end(), src->frames.begin(), src->frames.end() );
-        std::inplace_merge( dst->frames.begin(), dst->frames.begin() + sz, dst->frames.end() );
+        std::inplace_merge( dst->frames.begin(), dst->frames.begin() + sz, dst->frames.end(), [] ( const auto& lhs, const auto& rhs ) { return lhs.start < rhs.start; } );
     } );
 }
 
@@ -1743,6 +1789,12 @@ void Worker::Process( const QueueItem& ev )
     case QueueType::FrameMarkMsg:
         ProcessFrameMark( ev.frameMark );
         break;
+    case QueueType::FrameMarkMsgStart:
+        ProcessFrameMarkStart( ev.frameMark );
+        break;
+    case QueueType::FrameMarkMsgEnd:
+        ProcessFrameMarkEnd( ev.frameMark );
+        break;
     case QueueType::SourceLocation:
         AddSourceLocation( ev.srcloc );
         break;
@@ -1931,14 +1983,57 @@ void Worker::ProcessFrameMark( const QueueFrameMark& ev )
     auto fd = m_data.frames.Retrieve( ev.name, [this] ( uint64_t name ) {
         auto fd = m_slab.AllocInit<FrameData>();
         fd->name = name;
+        fd->continuous = 1;
         return fd;
     }, [this] ( uint64_t name ) {
         ServerQuery( ServerQueryFrameName, name );
     } );
 
+    assert( fd->continuous == 1 );
     const auto time = TscTime( ev.time );
-    assert( fd->frames.empty() || fd->frames.back() < time );
-    fd->frames.push_back( time );
+    assert( fd->frames.empty() || fd->frames.back().start < time );
+    fd->frames.push_back( FrameEvent{ time, -1 } );
+    m_data.lastTime = std::max( m_data.lastTime, time );
+}
+
+void Worker::ProcessFrameMarkStart( const QueueFrameMark& ev )
+{
+    auto fd = m_data.frames.Retrieve( ev.name, [this] ( uint64_t name ) {
+        auto fd = m_slab.AllocInit<FrameData>();
+        fd->name = name;
+        fd->continuous = 0;
+        return fd;
+    }, [this] ( uint64_t name ) {
+        ServerQuery( ServerQueryFrameName, name );
+    } );
+
+    assert( fd->continuous == 0 );
+    const auto time = TscTime( ev.time );
+    assert( fd->frames.empty() || ( fd->frames.back().end < time && fd->frames.back().end != -1 ) );
+    fd->frames.push_back( FrameEvent{ time, -1 } );
+    m_data.lastTime = std::max( m_data.lastTime, time );
+}
+
+void Worker::ProcessFrameMarkEnd( const QueueFrameMark& ev )
+{
+    auto fd = m_data.frames.Retrieve( ev.name, [this] ( uint64_t name ) {
+        auto fd = m_slab.AllocInit<FrameData>();
+        fd->name = name;
+        fd->continuous = 0;
+        return fd;
+    }, [this] ( uint64_t name ) {
+        ServerQuery( ServerQueryFrameName, name );
+    } );
+
+    assert( fd->continuous == 0 );
+    const auto time = TscTime( ev.time );
+    if( fd->frames.empty() )
+    {
+        assert( m_onDemand );
+        return;
+    }
+    assert( fd->frames.back().end == -1 );
+    fd->frames.back().end = time;
     m_data.lastTime = std::max( m_data.lastTime, time );
 }
 
@@ -2813,9 +2908,20 @@ void Worker::Write( FileWrite& f )
     for( auto& fd : m_data.frames.Data() )
     {
         f.Write( &fd->name, sizeof( fd->name ) );
+        f.Write( &fd->continuous, sizeof( fd->continuous ) );
         sz = fd->frames.size();
         f.Write( &sz, sizeof( sz ) );
-        f.Write( fd->frames.data(), sizeof( int64_t ) * sz );
+        if( fd->continuous )
+        {
+            for( auto& fe : fd->frames )
+            {
+                f.Write( &fe.start, sizeof( fe.start ) );
+            }
+        }
+        else
+        {
+            f.Write( fd->frames.data(), sizeof( FrameEvent ) * sz );
+        }
     }
 
     sz = m_data.stringData.size();

server/TracyWorker.hpp

@@ -264,6 +264,8 @@ private:
     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 ProcessFrameMarkStart( const QueueFrameMark& ev );
+    tracy_force_inline void ProcessFrameMarkEnd( const QueueFrameMark& ev );
     tracy_force_inline void ProcessZoneText( const QueueZoneText& ev );
     tracy_force_inline void ProcessZoneName( const QueueZoneText& ev );
     tracy_force_inline void ProcessLockAnnounce( const QueueLockAnnounce& ev );