mirror/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2024-11-10 10:41:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Return external names, instead of sending them.

Browse Source 
Note that the old function is still used by code, so this commit won't
compile.
This commit is contained in:
Bartosz Taudul 2021-10-22 22:20:30 +02:00
parent e2610b1483
commit f2b0aadedc
No known key found for this signature in database
GPG Key ID: B7FE2008B7575DF3
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
client/TracySysTrace.cpp
View File

@ -1,4 +1,5 @@
#include "TracyDebug.hpp" #include "TracyDebug.hpp"
#include "TracyStringHelpers.hpp"
#include "TracySysTrace.hpp" #include "TracySysTrace.hpp"
#include "../common/TracySystem.hpp" #include "../common/TracySystem.hpp"
@ -499,7 +500,7 @@ void SysTraceWorker( void* ptr )
tracy_free( s_prop ); tracy_free( s_prop );
} }
void SysTraceSendExternalName( uint64_t thread ) void SysTraceGetExternalName( uint64_t thread, const char*& threadName, const char*& name )
{ {
bool threadSent = false; bool threadSent = false;
auto hnd = OpenThread( THREAD_QUERY_INFORMATION, FALSE, DWORD( thread ) ); auto hnd = OpenThread( THREAD_QUERY_INFORMATION, FALSE, DWORD( thread ) );
@ -519,7 +520,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, ret, QueueType::ExternalThreadName ); threadName = CopyString( buf, ret );
threadSent = true; threadSent = true;
} }
} }
@ -551,7 +552,7 @@ void SysTraceSendExternalName( uint64_t thread )
const auto modlen = _GetModuleBaseNameA( phnd, modules[i], buf2, 1024 ); const auto modlen = _GetModuleBaseNameA( phnd, modules[i], buf2, 1024 );
if( modlen != 0 ) if( modlen != 0 )
{ {
GetProfiler().SendString( thread, buf2, modlen, QueueType::ExternalThreadName ); threadName = CopyString( buf2, modlen );
threadSent = true; threadSent = true;
} }
} }
@ -565,7 +566,7 @@ void SysTraceSendExternalName( uint64_t thread )
CloseHandle( hnd ); CloseHandle( hnd );
if( !threadSent ) if( !threadSent )
{ {
GetProfiler().SendString( thread, "???", 3, QueueType::ExternalThreadName ); threadName = CopyString( "???", 3 );
threadSent = true; threadSent = true;
} }
if( pid != 0 ) if( pid != 0 )
@ -579,7 +580,7 @@ void SysTraceSendExternalName( uint64_t thread )
} }
if( pid == 4 ) if( pid == 4 )
{ {
GetProfiler().SendString( thread, "System", 6, QueueType::ExternalName ); name = CopyStringFast( "System", 6 );
return; return;
} }
else else
@ -595,7 +596,7 @@ void SysTraceSendExternalName( uint64_t thread )
auto ptr = buf2 + sz - 1; auto ptr = buf2 + sz - 1;
while( ptr > buf2 && *ptr != '\\' ) ptr--; while( ptr > buf2 && *ptr != '\\' ) ptr--;
if( *ptr == '\\' ) ptr++; if( *ptr == '\\' ) ptr++;
GetProfiler().SendString( thread, ptr, QueueType::ExternalName ); name = CopyStringFast( ptr );
return; return;
} }
} }
@ -605,9 +606,9 @@ void SysTraceSendExternalName( uint64_t thread )
if( !threadSent ) if( !threadSent )
{ {
GetProfiler().SendString( thread, "???", 3, QueueType::ExternalThreadName ); threadName = CopyString( "???", 3 );
} }
GetProfiler().SendString( thread, "???", 3, QueueType::ExternalName ); name = CopyStringFast( "???", 3 );
} }
} }
@ -1695,7 +1696,7 @@ void SysTraceWorker( void* ptr )
} }
#endif #endif
void SysTraceSendExternalName( uint64_t thread ) void SysTraceGetExternalName( uint64_t thread, const char*& threadName, const char*& name )
{ {
FILE* f; FILE* f;
char fn[256]; char fn[256];
@ -1706,12 +1707,12 @@ void SysTraceSendExternalName( uint64_t thread )
char buf[256]; char buf[256];
const auto sz = fread( buf, 1, 256, f ); const auto sz = fread( buf, 1, 256, f );
if( sz > 0 && buf[sz-1] == '\n' ) buf[sz-1] = '\0'; if( sz > 0 && buf[sz-1] == '\n' ) buf[sz-1] = '\0';
GetProfiler().SendString( thread, buf, QueueType::ExternalThreadName ); threadName = CopyString( buf );
fclose( f ); fclose( f );
} }
else else
{ {
GetProfiler().SendString( thread, "???", 3, QueueType::ExternalThreadName ); threadName = CopyString( "???", 3 );
} }
sprintf( fn, "/proc/%" PRIu64 "/status", thread ); sprintf( fn, "/proc/%" PRIu64 "/status", thread );
@ -1720,7 +1721,7 @@ void SysTraceSendExternalName( uint64_t thread )
{ {
int pid = -1; int pid = -1;
size_t lsz = 1024; size_t lsz = 1024;
auto line = (char*)tracy_malloc( lsz ); auto line = (char*)tracy_malloc_fast( lsz );
for(;;) for(;;)
{ {
auto rd = getline( &line, &lsz, f ); auto rd = getline( &line, &lsz, f );
@ -1749,13 +1750,13 @@ void SysTraceSendExternalName( uint64_t thread )
char buf[256]; char buf[256];
const auto sz = fread( buf, 1, 256, f ); const auto sz = fread( buf, 1, 256, f );
if( sz > 0 && buf[sz-1] == '\n' ) buf[sz-1] = '\0'; if( sz > 0 && buf[sz-1] == '\n' ) buf[sz-1] = '\0';
GetProfiler().SendString( thread, buf, QueueType::ExternalName ); name = CopyStringFast( buf );
fclose( f ); fclose( f );
return; return;
} }
} }
} }
GetProfiler().SendString( thread, "???", 3, QueueType::ExternalName ); name = CopyStringFast( "???", 3 );
} }
} }

2
client/TracySysTrace.hpp
View File

@ -16,7 +16,7 @@ bool SysTraceStart( int64_t& samplingPeriod );
void SysTraceStop(); void SysTraceStop();
void SysTraceWorker( void* ptr ); void SysTraceWorker( void* ptr );
void SysTraceSendExternalName( uint64_t thread ); void SysTraceGetExternalName( uint64_t thread, const char*& threadName, const char*& name );
} }