mirror/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2024-11-26 16:04:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged in sherief/tracy-rpmalloc-bugfix (pull request #24)

Browse Source 
Fix for using Tracy with multithreaded NT loader in Windows 10 RS5 (Issue #26).
This commit is contained in:
Sherief Farouk 2018-10-29 10:08:20 +00:00 committed by Bartosz Taudul
commit 853eec451f
1 changed files with 37 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
client/TracyProfiler.cpp
View File

@ -56,6 +56,7 @@
#if defined _MSC_VER || defined __CYGWIN__ #if defined _MSC_VER || defined __CYGWIN__
# include <lmcons.h> # include <lmcons.h>
extern "C" typedef LONG (WINAPI *t_RtlGetVersion)( PRTL_OSVERSIONINFOW ); extern "C" typedef LONG (WINAPI *t_RtlGetVersion)( PRTL_OSVERSIONINFOW );
# define TRACY_USE_INIT_ONCE
#else #else
# include <unistd.h> # include <unistd.h>
# include <limits.h> # include <limits.h>
@ -71,14 +72,48 @@ extern "C" typedef LONG (WINAPI *t_RtlGetVersion)( PRTL_OSVERSIONINFOW );
namespace tracy namespace tracy
{ {
#if defined TRACY_USE_INIT_ONCE
namespace
{
BOOL CALLBACK InitOnceCallback(
PINIT_ONCE initOnce,
PVOID Parameter,
PVOID *Context)
{
rpmalloc_initialize();
return TRUE;
}
INIT_ONCE InitOnce = INIT_ONCE_STATIC_INIT;
}
#endif //if defined TRACY_USE_INIT_ONCE
struct RPMallocInit struct RPMallocInit
{ {
RPMallocInit() { rpmalloc_initialize(); } RPMallocInit()
{
#if defined TRACY_USE_INIT_ONCE
InitOnceExecuteOnce(&InitOnce, InitOnceCallback, nullptr, nullptr);
//We must call rpmalloc_thread_initialize() explicitly here since the InitOnceCallback might
//not be called on this thread if another thread has executed it earlier.
rpmalloc_thread_initialize();
#else
rpmalloc_initialize();
#endif //if defined TRACY_USE_INIT_ONCE
}
}; };
struct RPMallocThreadInit struct RPMallocThreadInit
{ {
RPMallocThreadInit() { rpmalloc_thread_initialize(); } RPMallocThreadInit()
{
#if defined TRACY_USE_INIT_ONCE
InitOnceExecuteOnce(&InitOnce, InitOnceCallback, nullptr, nullptr);
#endif //if defined TRACY_USE_INIT_ONCE
rpmalloc_thread_initialize();
}
}; };
struct InitTimeWrapper struct InitTimeWrapper