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

Replacing removing spinlock that is not needed anymore, making TRACY_MANUAL_LIFETIME a sub-option of TRACY_DELAYED_INIT, and addressing feedback

Browse Source
This commit is contained in:
Andrey Voroshilov 2020-07-12 10:04:07 -07:00
parent 4d505f507b
commit 6b790d778d
2 changed files with 5 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
client/TracyProfiler.cpp
View File

@ -922,7 +922,7 @@ TRACY_API void StartupProfiler()
} }
static ProfilerData& GetProfilerData() static ProfilerData& GetProfilerData()
{ {
while (!s_profilerData); assert(s_profilerData);
return *s_profilerData; return *s_profilerData;
} }
TRACY_API void ShutdownProfiler() TRACY_API void ShutdownProfiler()
@ -975,8 +975,7 @@ std::atomic<ThreadNameData*>& GetThreadNameData() { return GetProfilerData().thr
TRACY_API LuaZoneState& GetLuaZoneState() { return GetProfilerThreadData().luaZoneState; } TRACY_API LuaZoneState& GetLuaZoneState() { return GetProfilerThreadData().luaZoneState; }
# endif # endif
# ifdef TRACY_MANUAL_LIFETIME # ifndef TRACY_MANUAL_LIFETIME
# else
namespace namespace
{ {
const auto& __profiler_init = GetProfiler(); const auto& __profiler_init = GetProfiler();
@ -1023,27 +1022,11 @@ std::atomic<ThreadNameData*>& s_threadNameData = s_threadNameDataInstance;
thread_local LuaZoneState init_order(104) s_luaZoneState { 0, false }; thread_local LuaZoneState init_order(104) s_luaZoneState { 0, false };
# endif # endif
# ifdef TRACY_MANUAL_LIFETIME
Profiler* s_profiler = nullptr;
TRACY_API void StartupProfiler()
{
s_profiler = new Profiler;
}
TRACY_API void ShutdownProfiler()
{
delete s_profiler;
s_profiler = nullptr;
rpmalloc_finalize();
}
TRACY_API Profiler& GetProfiler() { return *s_profiler; }
# else
static Profiler init_order(105) s_profiler; static Profiler init_order(105) s_profiler;
TRACY_API Profiler& GetProfiler() { return s_profiler; }
# endif
TRACY_API moodycamel::ConcurrentQueue<QueueItem>::ExplicitProducer* GetToken() { return s_token.ptr; } TRACY_API moodycamel::ConcurrentQueue<QueueItem>::ExplicitProducer* GetToken() { return s_token.ptr; }
TRACY_API moodycamel::ConcurrentQueue<QueueItem>& GetQueue() { return s_queue; } TRACY_API moodycamel::ConcurrentQueue<QueueItem>& GetQueue() { return s_queue; }
TRACY_API Profiler& GetProfiler() { return s_profiler; }
TRACY_API int64_t GetInitTime() { return s_initTime.val; } TRACY_API int64_t GetInitTime() { return s_initTime.val; }
TRACY_API std::atomic<uint32_t>& GetLockCounter() { return s_lockCounter; } TRACY_API std::atomic<uint32_t>& GetLockCounter() { return s_lockCounter; }
TRACY_API std::atomic<uint8_t>& GetGpuCtxCounter() { return s_gpuCtxCounter; } TRACY_API std::atomic<uint8_t>& GetGpuCtxCounter() { return s_gpuCtxCounter; }
@ -1122,8 +1105,7 @@ Profiler::Profiler()
m_userPort = atoi( userPort ); m_userPort = atoi( userPort );
} }
#ifdef TRACY_MANUAL_LIFETIME #if !defined(TRACY_DELAYED_INIT) || !defined(TRACY_NONSTATIC_PROFILER)
#else
SpawnWorkerThreads(); SpawnWorkerThreads();
#endif #endif
} }

2
client/TracyProfiler.hpp
View File

@ -41,7 +41,7 @@
namespace tracy namespace tracy
{ {
#ifdef TRACY_MANUAL_LIFETIME #if defined(TRACY_DELAYED_INIT) && defined(TRACY_NONSTATIC_PROFILER)
void StartupProfiler(); void StartupProfiler();
void ShutdownProfiler(); void ShutdownProfiler();
#endif #endif