mirrors/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy synced 2025-05-08 16:03:53 +00:00
Code Issues Releases Wiki Activity

Just one early exit check in CheckString/CheckThreadString.

Browse Source
This commit is contained in:
Bartosz Taudul 2017-11-24 00:45:55 +01:00
parent 0e021bb798
commit ccb39ad4bd
2 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
server/TracyView.cpp
View File

@ -126,6 +126,8 @@ View::View( const char* addr )
, m_zonesCnt( 0 ) , m_zonesCnt( 0 )
, m_mbps( 64 ) , m_mbps( 64 )
, m_compRatio( 1 ) , m_compRatio( 1 )
, m_pendingStrings( 0 )
, m_pendingThreads( 0 )
, m_stream( LZ4_createStreamDecode() ) , m_stream( LZ4_createStreamDecode() )
, m_buffer( new char[TargetFrameSize*3 + 1] ) , m_buffer( new char[TargetFrameSize*3 + 1] )
, m_bufferOffset( 0 ) , m_bufferOffset( 0 )
@ -488,7 +490,7 @@ void View::Worker()
if( m_terminate ) if( m_terminate )
{ {
if( !m_pendingStrings.empty() || !m_pendingThreads.empty() || !m_pendingSourceLocation.empty() || if( m_pendingStrings != 0 || m_pendingThreads != 0 || !m_pendingSourceLocation.empty() ||
!m_pendingCustomStrings.empty() || !m_pendingPlots.empty() ) !m_pendingCustomStrings.empty() || !m_pendingPlots.empty() )
{ {
continue; continue;
@ -915,9 +917,9 @@ void View::CheckString( uint64_t ptr )
{ {
if( ptr == 0 ) return; if( ptr == 0 ) return;
if( m_strings.find( ptr ) != m_strings.end() ) return; if( m_strings.find( ptr ) != m_strings.end() ) return;
if( m_pendingStrings.find( ptr ) != m_pendingStrings.end() ) return;
m_pendingStrings.emplace( ptr ); m_strings.emplace( ptr, "???" );
m_pendingStrings++;
ServerQuery( ServerQueryString, ptr ); ServerQuery( ServerQueryString, ptr );
} }
@ -925,9 +927,9 @@ void View::CheckString( uint64_t ptr )
void View::CheckThreadString( uint64_t id ) void View::CheckThreadString( uint64_t id )
{ {
if( m_threadNames.find( id ) != m_threadNames.end() ) return; if( m_threadNames.find( id ) != m_threadNames.end() ) return;
if( m_pendingThreads.find( id ) != m_pendingThreads.end() ) return;
m_pendingThreads.emplace( id ); m_threadNames.emplace( id, "???" );
m_pendingThreads++;
ServerQuery( ServerQueryThreadString, id ); ServerQuery( ServerQueryThreadString, id );
} }
@ -945,22 +947,22 @@ void View::CheckSourceLocation( uint64_t ptr )
void View::AddString( uint64_t ptr, char* str, size_t sz ) void View::AddString( uint64_t ptr, char* str, size_t sz )
{ {
assert( m_strings.find( ptr ) == m_strings.end() ); assert( m_pendingStrings > 0 );
auto it = m_pendingStrings.find( ptr ); m_pendingStrings--;
assert( it != m_pendingStrings.end() ); auto it = m_strings.find( ptr );
m_pendingStrings.erase( it ); assert( it != m_strings.end() && strcmp( it->second, "???" ) == 0 );
const auto sl = StoreString( str, sz ); const auto sl = StoreString( str, sz );
m_strings.emplace( ptr, sl.ptr ); it->second = sl.ptr;
} }
void View::AddThreadString( uint64_t id, char* str, size_t sz ) void View::AddThreadString( uint64_t id, char* str, size_t sz )
{ {
assert( m_threadNames.find( id ) == m_threadNames.end() ); assert( m_pendingThreads > 0 );
auto it = m_pendingThreads.find( id ); m_pendingThreads--;
assert( it != m_pendingThreads.end() ); auto it = m_threadNames.find( id );
m_pendingThreads.erase( it ); assert( it != m_threadNames.end() && strcmp( it->second, "???" ) == 0 );
const auto sl = StoreString( str, sz ); const auto sl = StoreString( str, sz );
m_threadNames.emplace( id, sl.ptr ); it->second = sl.ptr;
} }
void View::AddCustomString( uint64_t ptr, char* str, size_t sz ) void View::AddCustomString( uint64_t ptr, char* str, size_t sz )

5
server/TracyView.hpp
View File

@ -194,8 +194,6 @@ private:
float m_compRatio; float m_compRatio;
// not used for vis - no need to lock // not used for vis - no need to lock
flat_hash_set<uint64_t, nohash<uint64_t>> m_pendingStrings;
flat_hash_set<uint64_t, nohash<uint64_t>> m_pendingThreads;
flat_hash_set<uint64_t, nohash<uint64_t>> m_pendingSourceLocation; flat_hash_set<uint64_t, nohash<uint64_t>> m_pendingSourceLocation;
flat_hash_map<uint64_t, StringLocation, nohash<uint64_t>> m_pendingCustomStrings; 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<uint64_t, ThreadData*, nohash<uint64_t>> m_threadMap;
@ -207,6 +205,9 @@ private:
flat_hash_map<uint64_t, int32_t, nohash<uint64_t>> m_pendingSourceLocationPayload; flat_hash_map<uint64_t, int32_t, nohash<uint64_t>> m_pendingSourceLocationPayload;
Vector<uint64_t> m_sourceLocationQueue; Vector<uint64_t> m_sourceLocationQueue;
uint32_t m_pendingStrings;
uint32_t m_pendingThreads;
Slab<64*1024*1024> m_slab; Slab<64*1024*1024> m_slab;
LZ4_streamDecode_t* m_stream; LZ4_streamDecode_t* m_stream;