diff options
| author |  bunnei | 2020-08-31 21:20:08 -0400 |
|---|---|---|
| committer |  GitHub | 2020-08-31 21:20:08 -0400 |
| commit | 2579a7199b3ee8ad4bf65993a948612b32c3a89c (patch) | |
| tree | fa1e8ac00c89ba206f2a32486a26c49eea936488 | |
| parent | Merge pull request #4461 from comex/thread-names (diff) | |
| parent | externals/microprofile: Fix data race in g_bUseLock (diff) | |
| download | yuzu-2579a7199b3ee8ad4bf65993a948612b32c3a89c.tar.gz yuzu-2579a7199b3ee8ad4bf65993a948612b32c3a89c.tar.xz yuzu-2579a7199b3ee8ad4bf65993a948612b32c3a89c.zip | |
Merge pull request #4587 from yuzu-emu/tsan-microprofiler
externals/microprofile: Fix data race in g_bUseLock
| -rw-r--r-- | externals/microprofile/microprofile.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/externals/microprofile/microprofile.h b/externals/microprofile/microprofile.h index 6dae65a66..85d5bd5de 100644 --- a/externals/microprofile/microprofile.h +++ b/externals/microprofile/microprofile.h | |||
| @@ -1037,7 +1037,7 @@ static void MicroProfileCreateThreadLogKey() | |||
| 1037 | #else | 1037 | #else |
| 1038 | MP_THREAD_LOCAL MicroProfileThreadLog* g_MicroProfileThreadLog = 0; | 1038 | MP_THREAD_LOCAL MicroProfileThreadLog* g_MicroProfileThreadLog = 0; |
| 1039 | #endif | 1039 | #endif |
| 1040 | static bool g_bUseLock = false; /// This is used because windows does not support using mutexes under dll init(which is where global initialization is handled) | 1040 | static std::atomic<bool> g_bUseLock{false}; /// This is used because windows does not support using mutexes under dll init(which is where global initialization is handled) |
| 1041 | 1041 | ||
| 1042 | 1042 | ||
| 1043 | MICROPROFILE_DEFINE(g_MicroProfileFlip, "MicroProfile", "MicroProfileFlip", 0x3355ee); | 1043 | MICROPROFILE_DEFINE(g_MicroProfileFlip, "MicroProfile", "MicroProfileFlip", 0x3355ee); |