diff --git a/server/TracyEvent.hpp b/server/TracyEvent.hpp index c6f18fe9..a21793f5 100644 --- a/server/TracyEvent.hpp +++ b/server/TracyEvent.hpp @@ -66,8 +66,6 @@ enum { SourceLocationSize = sizeof( SourceLocation ) }; struct ZoneEvent { - void Init() { memset( &child, 0, 12 ); } - int64_t start; int64_t end; int32_t srcloc; @@ -79,7 +77,6 @@ struct ZoneEvent }; enum { ZoneEventSize = sizeof( ZoneEvent ) }; -static_assert( sizeof( ZoneEvent::child ) == 13, "Adjust vector clear size!" ); struct LockEvent @@ -108,8 +105,6 @@ static_assert( std::numeric_limits::max() >= Max struct GpuEvent { - void Init() { memset( &child, 0, 12 ); } - int64_t cpuStart; int64_t cpuEnd; int64_t gpuStart; @@ -120,7 +115,6 @@ struct GpuEvent }; enum { GpuEventSize = sizeof( GpuEvent ) }; -static_assert( sizeof( GpuEvent::child ) == 13, "Adjust vector clear size!" ); #pragma pack() diff --git a/server/TracyVector.hpp b/server/TracyVector.hpp index 34dc37fd..2edfb21a 100644 --- a/server/TracyVector.hpp +++ b/server/TracyVector.hpp @@ -24,7 +24,6 @@ public: Vector() : m_ptr( nullptr ) , m_size( 0 ) - , m_capacity( 0 ) { } diff --git a/server/TracyView.cpp b/server/TracyView.cpp index aad2b3be..30c0f46c 100644 --- a/server/TracyView.cpp +++ b/server/TracyView.cpp @@ -619,8 +619,7 @@ void View::Process( const QueueItem& ev ) void View::ProcessZoneBegin( const QueueZoneBegin& ev ) { - auto zone = m_slab.Alloc(); - zone->Init(); + auto zone = m_slab.AllocInit(); CheckSourceLocation( ev.srcloc ); @@ -639,8 +638,7 @@ void View::ProcessZoneBeginAllocSrcLoc( const QueueZoneBegin& ev ) auto it = m_pendingSourceLocationPayload.find( ev.srcloc ); assert( it != m_pendingSourceLocationPayload.end() ); - auto zone = m_slab.Alloc(); - zone->Init(); + auto zone = m_slab.AllocInit(); zone->start = ev.time * m_timerMul; zone->end = -1; @@ -844,8 +842,7 @@ void View::ProcessGpuZoneBegin( const QueueGpuZoneBegin& ev ) CheckSourceLocation( ev.srcloc ); - auto zone = m_slab.Alloc(); - zone->Init(); + auto zone = m_slab.AllocInit(); zone->cpuStart = ev.cpuTime * m_timerMul; zone->cpuEnd = -1; @@ -3822,8 +3819,7 @@ void View::ReadTimeline( FileRead& f, Vector& vec ) for( uint64_t i=0; i(); - zone->Init(); + auto zone = m_slab.AllocInit(); m_zonesCnt++; vec.push_back( zone ); @@ -3846,8 +3842,7 @@ void View::ReadTimeline( FileRead& f, Vector& vec ) for( uint64_t i=0; i(); - zone->Init(); + auto zone = m_slab.AllocInit(); vec.push_back( zone );