mirror/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2024-11-23 06:44:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't calculate known strings length.

Browse Source
This commit is contained in:
Bartosz Taudul 2020-07-21 17:21:09 +02:00
parent e4fbf60668
commit 5d748f3568
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/TracyProfiler.cpp
View File

@ -2429,7 +2429,7 @@ bool Profiler::HandleServerQuery()
case ServerQueryThreadString: case ServerQueryThreadString:
if( ptr == m_mainThread ) if( ptr == m_mainThread )
{ {
SendString( ptr, "Main thread", QueueType::ThreadName ); SendString( ptr, "Main thread", 11, QueueType::ThreadName );
} }
else else
{ {

19
client/TracySysTrace.cpp
View File

@ -481,7 +481,7 @@ void SysTraceSendExternalName( uint64_t thread )
auto ret = wcstombs( buf, tmp, 256 ); auto ret = wcstombs( buf, tmp, 256 );
if( ret != 0 ) if( ret != 0 )
{ {
GetProfiler().SendString( thread, buf, QueueType::ExternalThreadName ); GetProfiler().SendString( thread, buf, ret, QueueType::ExternalThreadName );
threadSent = true; threadSent = true;
} }
} }
@ -509,9 +509,10 @@ void SysTraceSendExternalName( uint64_t thread )
if( (uint64_t)ptr >= (uint64_t)info.lpBaseOfDll && (uint64_t)ptr <= (uint64_t)info.lpBaseOfDll + (uint64_t)info.SizeOfImage ) if( (uint64_t)ptr >= (uint64_t)info.lpBaseOfDll && (uint64_t)ptr <= (uint64_t)info.lpBaseOfDll + (uint64_t)info.SizeOfImage )
{ {
char buf2[1024]; char buf2[1024];
if( _GetModuleBaseNameA( phnd, modules[i], buf2, 1024 ) != 0 ) const auto modlen = _GetModuleBaseNameA( phnd, modules[i], buf2, 1024 );
if( modlen != 0 )
{ {
GetProfiler().SendString( thread, buf2, QueueType::ExternalThreadName ); GetProfiler().SendString( thread, buf2, modlen, QueueType::ExternalThreadName );
threadSent = true; threadSent = true;
} }
} }
@ -525,7 +526,7 @@ void SysTraceSendExternalName( uint64_t thread )
CloseHandle( hnd ); CloseHandle( hnd );
if( !threadSent ) if( !threadSent )
{ {
GetProfiler().SendString( thread, "???", QueueType::ExternalThreadName ); GetProfiler().SendString( thread, "???", 3, QueueType::ExternalThreadName );
threadSent = true; threadSent = true;
} }
if( pid != 0 ) if( pid != 0 )
@ -539,7 +540,7 @@ void SysTraceSendExternalName( uint64_t thread )
} }
if( pid == 4 ) if( pid == 4 )
{ {
GetProfiler().SendString( thread, "System", QueueType::ExternalName ); GetProfiler().SendString( thread, "System", 6, QueueType::ExternalName );
return; return;
} }
else else
@ -565,9 +566,9 @@ void SysTraceSendExternalName( uint64_t thread )
if( !threadSent ) if( !threadSent )
{ {
GetProfiler().SendString( thread, "???", QueueType::ExternalThreadName ); GetProfiler().SendString( thread, "???", 3, QueueType::ExternalThreadName );
} }
GetProfiler().SendString( thread, "???", QueueType::ExternalName ); GetProfiler().SendString( thread, "???", 3, QueueType::ExternalName );
} }
} }
@ -1060,7 +1061,7 @@ void SysTraceSendExternalName( uint64_t thread )
} }
else else
{ {
GetProfiler().SendString( thread, "???", QueueType::ExternalThreadName ); GetProfiler().SendString( thread, "???", 3, QueueType::ExternalThreadName );
} }
sprintf( fn, "/proc/%" PRIu64 "/status", thread ); sprintf( fn, "/proc/%" PRIu64 "/status", thread );
@ -1104,7 +1105,7 @@ void SysTraceSendExternalName( uint64_t thread )
} }
} }
} }
GetProfiler().SendString( thread, "???", QueueType::ExternalName ); GetProfiler().SendString( thread, "???", 3, QueueType::ExternalName );
} }
} }