mirrors/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy synced 2025-05-03 14:03:52 +00:00
Code Issues Releases Wiki Activity

Fix for using Tracy with multithreaded NT loader in Windows 10 RS5 (Issue #26) [Take 2].

Browse Source
This commit is contained in:
Sherief Farouk 2018-10-28 18:55:55 -07:00
parent 27447902ef
commit 5110d55f17
1 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
client/TracyProfiler.cpp
View File

@ -56,7 +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_INITONCE (1) # define TRACY_USE_INITONCE
#else #else
# include <unistd.h> # include <unistd.h>
# include <limits.h> # include <limits.h>
@ -72,18 +72,6 @@ extern "C" typedef LONG (WINAPI *t_RtlGetVersion)( PRTL_OSVERSIONINFOW );
namespace tracy namespace tracy
{ {
struct RPMallocInit
{
RPMallocInit()
{
#if defined TRACY_USE_INITONCE
rpmalloc_thread_initialize();
#else
rpmalloc_initialize();
#endif //if defined TRACY_USE_INITONCE
}
};
#if defined TRACY_USE_INITONCE #if defined TRACY_USE_INITONCE
namespace namespace
{ {
@ -95,17 +83,35 @@ namespace
rpmalloc_initialize(); rpmalloc_initialize();
return TRUE; return TRUE;
} }
INIT_ONCE InitOnce = INIT_ONCE_STATIC_INIT;
} }
#endif //if defined TRACY_USE_INITONCE #endif //if defined TRACY_USE_INITONCE
struct RPMallocInit
{
RPMallocInit()
{
#if defined TRACY_USE_INITONCE
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_INITONCE
}
};
struct RPMallocThreadInit struct RPMallocThreadInit
{ {
RPMallocThreadInit() RPMallocThreadInit()
{ {
#if defined TRACY_USE_INITONCE #if defined TRACY_USE_INITONCE
static INIT_ONCE InitOnce = INIT_ONCE_STATIC_INIT;
InitOnceExecuteOnce(&InitOnce, InitOnceCallback, nullptr, nullptr); InitOnceExecuteOnce(&InitOnce, InitOnceCallback, nullptr, nullptr);
#endif //if defined TRACY_USE_INITONCE #endif //if defined TRACY_USE_INITONCE
rpmalloc_thread_initialize(); rpmalloc_thread_initialize();
} }
}; };