From 4bb4a568ca1155259bffdf29b8d5810064528868 Mon Sep 17 00:00:00 2001 From: Bartosz Taudul Date: Sat, 22 Dec 2018 17:22:26 +0100 Subject: [PATCH] Move initialization of View values to header. --- server/TracyView.cpp | 71 ------------------------------------------- server/TracyView.hpp | 72 ++++++++++++++++++++++---------------------- 2 files changed, 36 insertions(+), 107 deletions(-) diff --git a/server/TracyView.cpp b/server/TracyView.cpp index 2bf37ff2..d3bf86b3 100644 --- a/server/TracyView.cpp +++ b/server/TracyView.cpp @@ -290,46 +290,10 @@ static View* s_instance = nullptr; View::View( const char* addr, ImFont* fixedWidth, SetTitleCallback stcb ) : m_worker( addr ) , m_staticView( false ) - , m_frameScale( 0 ) , m_pause( false ) - , m_frameStart( 0 ) - , m_zvStart( 0 ) - , m_zvEnd( 0 ) - , m_zvHeight( 0 ) - , m_zvScroll( 0 ) - , m_zoneInfoWindow( nullptr ) - , m_zoneSrcLocHighlight( 0 ) - , m_lockHighlight { -1 } - , m_msgHighlight( nullptr ) - , m_msgToFocus( nullptr ) - , m_gpuInfoWindow( nullptr ) - , m_callstackInfoWindow( 0 ) - , m_memoryAllocInfoWindow( -1 ) - , m_memoryAllocHover( -1 ) - , m_memoryAllocHoverWait( 0 ) , m_frames( nullptr ) - , m_lockInfoWindow( InvalidId ) - , m_gpuThread( 0 ) - , m_gpuStart( 0 ) - , m_gpuEnd( 0 ) - , m_showOptions( false ) - , m_showMessages( false ) - , m_showStatistics( false ) - , m_showInfo( false ) - , m_drawGpuZones( true ) - , m_drawZones( true ) - , m_drawLocks( true ) - , m_drawPlots( true ) - , m_onlyContendedLocks( true ) - , m_goToFrame( false ) - , m_statSort( 0 ) - , m_statSelf( false ) - , m_showCallstackFrameAddress( false ) - , m_showUnknownFrames( true ) - , m_namespace( Namespace::Full ) , m_textEditorFont( fixedWidth ) , m_stcb( stcb ) - , m_titleSet( false ) { assert( s_instance == nullptr ); s_instance = this; @@ -340,45 +304,10 @@ View::View( const char* addr, ImFont* fixedWidth, SetTitleCallback stcb ) View::View( FileRead& f, ImFont* fixedWidth, SetTitleCallback stcb ) : m_worker( f ) , m_staticView( true ) - , m_frameScale( 0 ) , m_pause( true ) - , m_frameStart( 0 ) - , m_zvStart( 0 ) - , m_zvEnd( 0 ) - , m_zvHeight( 0 ) - , m_zvScroll( 0 ) - , m_zoneInfoWindow( nullptr ) - , m_zoneSrcLocHighlight( 0 ) - , m_msgHighlight( nullptr ) - , m_msgToFocus( nullptr ) - , m_gpuInfoWindow( nullptr ) - , m_callstackInfoWindow( 0 ) - , m_memoryAllocInfoWindow( -1 ) - , m_memoryAllocHover( -1 ) - , m_memoryAllocHoverWait( 0 ) , m_frames( m_worker.GetFramesBase() ) - , m_lockInfoWindow( InvalidId ) - , m_gpuThread( 0 ) - , m_gpuStart( 0 ) - , m_gpuEnd( 0 ) - , m_showOptions( false ) - , m_showMessages( false ) - , m_showStatistics( false ) - , m_showInfo( false ) - , m_drawGpuZones( true ) - , m_drawZones( true ) - , m_drawLocks( true ) - , m_drawPlots( true ) - , m_onlyContendedLocks( true ) - , m_goToFrame( false ) - , m_statSort( 0 ) - , m_statSelf( false ) - , m_showCallstackFrameAddress( false ) - , m_showUnknownFrames( true ) - , m_namespace( Namespace::Full ) , m_textEditorFont( fixedWidth ) , m_stcb( stcb ) - , m_titleSet( false ) { assert( s_instance == nullptr ); s_instance = this; diff --git a/server/TracyView.hpp b/server/TracyView.hpp index b65eb4c2..bbd75f97 100644 --- a/server/TracyView.hpp +++ b/server/TracyView.hpp @@ -204,59 +204,59 @@ private: Worker m_worker; bool m_staticView; - int m_frameScale; + int m_frameScale = 0; bool m_pause; - int m_frameStart; + int m_frameStart = 0; - int64_t m_zvStart; - int64_t m_zvEnd; + int64_t m_zvStart = 0; + int64_t m_zvEnd = 0; int64_t m_lastTime; int8_t m_lastCpu; - int m_zvHeight; - int m_zvScroll; + int m_zvHeight = 0; + int m_zvScroll = 0; - const ZoneEvent* m_zoneInfoWindow; + const ZoneEvent* m_zoneInfoWindow = nullptr; const ZoneEvent* m_zoneHighlight; - DecayValue m_zoneSrcLocHighlight; - LockHighlight m_lockHighlight; - DecayValue m_msgHighlight; - const MessageData* m_msgToFocus; - const GpuEvent* m_gpuInfoWindow; + DecayValue m_zoneSrcLocHighlight = 0; + LockHighlight m_lockHighlight { -1 }; + DecayValue m_msgHighlight = nullptr; + const MessageData* m_msgToFocus = nullptr; + const GpuEvent* m_gpuInfoWindow = nullptr; const GpuEvent* m_gpuHighlight; uint64_t m_gpuInfoWindowThread; - uint32_t m_callstackInfoWindow; - int64_t m_memoryAllocInfoWindow; - int64_t m_memoryAllocHover; - int m_memoryAllocHoverWait; + uint32_t m_callstackInfoWindow = 0; + int64_t m_memoryAllocInfoWindow = -1; + int64_t m_memoryAllocHover = -1; + int m_memoryAllocHoverWait = 0; const FrameData* m_frames; - uint32_t m_lockInfoWindow; + uint32_t m_lockInfoWindow = InvalidId; Region m_highlight; Region m_highlightZoom; - uint64_t m_gpuThread; - int64_t m_gpuStart; - int64_t m_gpuEnd; + uint64_t m_gpuThread = 0; + int64_t m_gpuStart = 0; + int64_t m_gpuEnd = 0; - bool m_showOptions; - bool m_showMessages; - bool m_showStatistics; - bool m_showInfo; - bool m_drawGpuZones; - bool m_drawZones; - bool m_drawLocks; - bool m_drawPlots; - bool m_onlyContendedLocks; - bool m_goToFrame; + bool m_showOptions = false; + bool m_showMessages = false; + bool m_showStatistics = false; + bool m_showInfo = false; + bool m_drawGpuZones = true; + bool m_drawZones = true; + bool m_drawLocks = true; + bool m_drawPlots = true; + bool m_onlyContendedLocks = true; + bool m_goToFrame = false; - int m_statSort; - bool m_statSelf; - bool m_showCallstackFrameAddress; - bool m_showUnknownFrames; + int m_statSort = 0; + bool m_statSelf = false; + bool m_showCallstackFrameAddress = false; + bool m_showUnknownFrames = true; - Namespace m_namespace; + Namespace m_namespace = Namespace::Full; Animation m_zoomAnim; BuzzAnim m_callstackBuzzAnim; BuzzAnim m_callstackTreeBuzzAnim; @@ -274,7 +274,7 @@ private: float m_rootWidth, m_rootHeight; SetTitleCallback m_stcb; - bool m_titleSet; + bool m_titleSet = false; struct FindZone { enum : uint64_t { Unselected = std::numeric_limits::max() - 1 };