mirror/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2024-09-20 05:42:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Manual collection of thread names on android.

Browse Source
This commit is contained in:
Bartosz Taudul 2017-10-30 20:45:00 +01:00
parent 32532277e3
commit cf3d8eb810
3 changed files with 61 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client/TracyProfiler.cpp
View File

@ -98,6 +98,12 @@ static InitTimeWrapper init_order(101) s_initTime { Profiler::GetTime() };
static RPMallocInit init_order(102) s_rpmalloc_init; static RPMallocInit init_order(102) s_rpmalloc_init;
moodycamel::ConcurrentQueue<QueueItem> init_order(103) s_queue( QueuePrealloc ); moodycamel::ConcurrentQueue<QueueItem> init_order(103) s_queue( QueuePrealloc );
std::atomic<uint32_t> init_order(104) s_lockCounter( 0 ); std::atomic<uint32_t> init_order(104) s_lockCounter( 0 );
#ifdef TRACY_COLLECT_THREAD_NAMES
struct ThreadNameData;
std::atomic<ThreadNameData*> init_order(104) s_threadNameData( nullptr );
#endif
static Profiler init_order(105) s_profiler; static Profiler init_order(105) s_profiler;

62
common/TracySystem.cpp
View File

@ -6,17 +6,28 @@
# include <unistd.h> # include <unistd.h>
#endif #endif
#ifdef __ANDROID__
# include <sys/prctl.h>
#endif
#include <inttypes.h> #include <inttypes.h>
#include "TracySystem.hpp" #include "TracySystem.hpp"
#ifdef TRACY_COLLECT_THREAD_NAMES
# include <atomic>
# include "../client/tracy_rpmalloc.hpp"
#endif
namespace tracy namespace tracy
{ {
#ifdef TRACY_COLLECT_THREAD_NAMES
struct ThreadNameData
{
uint64_t id;
const char* name;
ThreadNameData* next;
};
extern std::atomic<ThreadNameData*> s_threadNameData;
#endif
void SetThreadName( std::thread& thread, const char* name ) void SetThreadName( std::thread& thread, const char* name )
{ {
SetThreadName( thread.native_handle(), name ); SetThreadName( thread.native_handle(), name );
@ -70,13 +81,42 @@ void SetThreadName( std::thread::native_handle_type handle, const char* name )
pthread_setname_np( handle, buf ); pthread_setname_np( handle, buf );
} }
#endif #endif
#ifdef TRACY_COLLECT_THREAD_NAMES
{
const auto sz = strlen( name );
char* buf = (char*)rpmalloc( sz+1 );
memcpy( buf, name, sz );
buf[sz+1] = '\0';
auto data = (ThreadNameData*)rpmalloc( sizeof( ThreadNameData ) );
# ifdef _WIN32
data->id = GetThreadId( static_cast<HANDLE>( handle ) );
# else
data->id = (uint64_t)handle;
# endif
data->name = buf;
data->next = s_threadNameData.load( std::memory_order_relaxed );
while( !s_threadNameData.compare_exchange_weak( data->next, data, std::memory_order_release, std::memory_order_relaxed ) ) {}
}
#endif
} }
const char* GetThreadName( uint64_t id ) const char* GetThreadName( uint64_t id )
{ {
static char buf[256]; static char buf[256];
#ifdef _WIN32 #ifdef TRACY_COLLECT_THREAD_NAMES
# ifdef NTDDI_WIN10_RS2 auto ptr = s_threadNameData.load( std::memory_order_relaxed );
while( ptr )
{
if( ptr->id == id )
{
strcpy( buf, ptr->name );
return buf;
}
ptr = ptr->next;
}
#else
# ifdef _WIN32
# ifdef NTDDI_WIN10_RS2
auto hnd = OpenThread( THREAD_QUERY_LIMITED_INFORMATION, FALSE, (DWORD)id ); auto hnd = OpenThread( THREAD_QUERY_LIMITED_INFORMATION, FALSE, (DWORD)id );
if( hnd != 0 ) if( hnd != 0 )
{ {
@ -89,17 +129,13 @@ const char* GetThreadName( uint64_t id )
return buf; return buf;
} }
} }
# endif # endif
#elif defined __ANDROID__ # elif defined _GNU_SOURCE
if( prctl( PR_GET_NAME, (unsigned long)buf, 0, 0, 0 ) == 0 )
{
return buf;
}
#elif defined _GNU_SOURCE
if( pthread_getname_np( (pthread_t)id, buf, 256 ) == 0 ) if( pthread_getname_np( (pthread_t)id, buf, 256 ) == 0 )
{ {
return buf; return buf;
} }
# endif
#endif #endif
sprintf( buf, "%" PRIu64, id ); sprintf( buf, "%" PRIu64, id );
return buf; return buf;

6
common/TracySystem.hpp
View File

@ -1,6 +1,12 @@
#ifndef __TRACYSYSTEM_HPP__ #ifndef __TRACYSYSTEM_HPP__
#define __TRACYSYSTEM_HPP__ #define __TRACYSYSTEM_HPP__
#ifdef TRACY_ENABLE
# ifdef __ANDROID__
# define TRACY_COLLECT_THREAD_NAMES
# endif
#endif
#ifdef _WIN32 #ifdef _WIN32
extern "C" __declspec(dllimport) unsigned long __stdcall GetCurrentThreadId(void); extern "C" __declspec(dllimport) unsigned long __stdcall GetCurrentThreadId(void);
#else #else