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

Hide rpmalloc init behind thread local boolean.

Browse Source
This commit is contained in:
Bartosz Taudul 2021-05-31 22:38:22 +02:00
parent b0fc0d5dcc
commit 3da84d1579
No known key found for this signature in database
GPG Key ID: B7FE2008B7575DF3
4 changed files with 42 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
TracyClient.cpp
View File

@ -27,6 +27,7 @@
#include "common/TracySocket.cpp" #include "common/TracySocket.cpp"
#include "client/tracy_rpmalloc.cpp" #include "client/tracy_rpmalloc.cpp"
#include "client/TracyDxt1.cpp" #include "client/TracyDxt1.cpp"
#include "client/TracyAlloc.cpp"
#if TRACY_HAS_CALLSTACK == 2 || TRACY_HAS_CALLSTACK == 3 || TRACY_HAS_CALLSTACK == 4 || TRACY_HAS_CALLSTACK == 6 #if TRACY_HAS_CALLSTACK == 2 || TRACY_HAS_CALLSTACK == 3 || TRACY_HAS_CALLSTACK == 4 || TRACY_HAS_CALLSTACK == 6
# include "libbacktrace/alloc.cpp" # include "libbacktrace/alloc.cpp"

35
client/TracyAlloc.cpp Normal file
View File

@ -0,0 +1,35 @@
#ifdef TRACY_ENABLE
#include <atomic>
#include "../common/TracyAlloc.hpp"
#include "../common/TracyYield.hpp"
namespace tracy
{
extern std::atomic<int> RpInitDone;
extern std::atomic<int> RpInitLock;
TRACY_API void InitRpmallocPlumbing()
{
const auto done = RpInitDone.load( std::memory_order_acquire );
if( !done )
{
int expected = 0;
while( !RpInitLock.compare_exchange_weak( expected, 1, std::memory_order_release, std::memory_order_relaxed ) ) { expected = 0; YieldThread(); }
const auto done = RpInitDone.load( std::memory_order_acquire );
if( !done )
{
rpmalloc_initialize();
RpInitDone.store( 1, std::memory_order_release );
}
RpInitLock.store( 0, std::memory_order_release );
}
rpmalloc_thread_initialize();
RpThreadInitDone = true;
}
}
#endif

2
client/TracyProfiler.cpp
View File

@ -977,6 +977,7 @@ TRACY_API void ShutdownProfiler()
# else # else
std::atomic<int> RpInitDone { 0 }; std::atomic<int> RpInitDone { 0 };
std::atomic<int> RpInitLock { 0 }; std::atomic<int> RpInitLock { 0 };
thread_local bool RpThreadInitDone = false;
static std::atomic<int> profilerDataLock { 0 }; static std::atomic<int> profilerDataLock { 0 };
static std::atomic<ProfilerData*> profilerData { nullptr }; static std::atomic<ProfilerData*> profilerData { nullptr };
@ -1097,6 +1098,7 @@ thread_local ThreadHandleWrapper init_order(104) s_threadHandle { detail::GetThr
static InitTimeWrapper init_order(101) s_initTime { SetupHwTimer() }; static InitTimeWrapper init_order(101) s_initTime { SetupHwTimer() };
std::atomic<int> init_order(102) RpInitDone( 0 ); std::atomic<int> init_order(102) RpInitDone( 0 );
std::atomic<int> init_order(102) RpInitLock( 0 ); std::atomic<int> init_order(102) RpInitLock( 0 );
thread_local bool RpThreadInitDone = false;
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 );
std::atomic<uint8_t> init_order(104) s_gpuCtxCounter( 0 ); std::atomic<uint8_t> init_order(104) s_gpuCtxCounter( 0 );

27
common/TracyAlloc.hpp
View File

@ -4,9 +4,8 @@
#include <stdlib.h> #include <stdlib.h>
#ifdef TRACY_ENABLE #ifdef TRACY_ENABLE
# include <atomic> # include "TracyApi.h"
# include "TracyForceInline.hpp" # include "TracyForceInline.hpp"
# include "TracyYield.hpp"
# include "../client/tracy_rpmalloc.hpp" # include "../client/tracy_rpmalloc.hpp"
#endif #endif
@ -14,30 +13,12 @@ namespace tracy
{ {
#ifdef TRACY_ENABLE #ifdef TRACY_ENABLE
extern std::atomic<int> RpInitDone; extern thread_local bool RpThreadInitDone;
extern std::atomic<int> RpInitLock; TRACY_API void InitRpmallocPlumbing();
namespace
{
static inline void InitRpmallocPlumbing()
{
int expected = 0;
while( !RpInitLock.compare_exchange_weak( expected, 1, std::memory_order_release, std::memory_order_relaxed ) ) { expected = 0; YieldThread(); }
const auto done = RpInitDone.load( std::memory_order_acquire );
if( !done )
{
rpmalloc_initialize();
RpInitDone.store( 1, std::memory_order_release );
}
RpInitLock.store( 0, std::memory_order_release );
}
static tracy_force_inline void InitRpmalloc() static tracy_force_inline void InitRpmalloc()
{ {
const auto done = RpInitDone.load( std::memory_order_acquire ); if( !RpThreadInitDone ) InitRpmallocPlumbing();
if( !done ) InitRpmallocPlumbing();
rpmalloc_thread_initialize();
}
} }
#endif #endif