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

Lock counter also must be initialized early.

Browse Source
This commit is contained in:
Bartosz Taudul 2017-10-24 22:02:49 +02:00
parent 8f814b2537
commit 03289175ab
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/TracyLock.hpp
View File

@ -10,7 +10,7 @@
namespace tracy namespace tracy
{ {
static std::atomic<uint32_t> s_lockCounter( 0 ); extern std::atomic<uint32_t> s_lockCounter;
template<class T> template<class T>
class Lockable class Lockable

9
client/TracyProfiler.cpp
View File

@ -78,11 +78,11 @@ static unsigned int __dontcare_cpu;
// 1a. But s_queue is needed for initialization of variables in point 2. // 1a. But s_queue is needed for initialization of variables in point 2.
extern moodycamel::ConcurrentQueue<QueueItem> s_queue; extern moodycamel::ConcurrentQueue<QueueItem> s_queue;
static thread_local RPMallocThreadInit init_order(105) s_rpmalloc_thread_init; static thread_local RPMallocThreadInit init_order(106) s_rpmalloc_thread_init;
// 2. If these variables would be in the .CRT$XCB section, they would be initialized only in main thread. // 2. If these variables would be in the .CRT$XCB section, they would be initialized only in main thread.
static thread_local moodycamel::ProducerToken init_order(106) s_token_detail( s_queue ); static thread_local moodycamel::ProducerToken init_order(107) s_token_detail( s_queue );
thread_local ProducerWrapper init_order(107) s_token { s_queue.get_explicit_producer( s_token_detail ) }; thread_local ProducerWrapper init_order(108) s_token { s_queue.get_explicit_producer( s_token_detail ) };
#ifdef _MSC_VER #ifdef _MSC_VER
// 1. Initialize these static variables before all other variables. // 1. Initialize these static variables before all other variables.
@ -93,7 +93,8 @@ thread_local ProducerWrapper init_order(107) s_token { s_queue.get_explicit_prod
static InitTimeWrapper init_order(101) s_initTime { Profiler::GetTime( __dontcare_cpu ) }; static InitTimeWrapper init_order(101) s_initTime { Profiler::GetTime( __dontcare_cpu ) };
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 );
static Profiler init_order(104) s_profiler; std::atomic<uint32_t> init_order(104) s_lockCounter( 0 );
static Profiler init_order(105) s_profiler;
Profiler::Profiler() Profiler::Profiler()