Make WARN() and ERR() thread safe

src/common/debug.cpp

@@ -13,6 +13,7 @@
 #include <array>
 #include <cstdio>
 #include <fstream>
+#include <mutex>
 #include <ostream>
 #include <vector>
 
@@ -31,6 +32,8 @@ namespace
 
 DebugAnnotator *g_debugAnnotator = nullptr;
 
+std::mutex *g_debugMutex = nullptr;
+
 constexpr std::array<const char *, LOG_NUM_SEVERITIES> g_logSeverityNames = {
     {"EVENT", "WARN", "ERR"}};
 
@@ -96,6 +99,14 @@ void UninitializeDebugAnnotations()
     g_debugAnnotator = nullptr;
 }
 
+void InitializeDebugMutexIfNeeded()
+{
+    if (g_debugMutex == nullptr)
+    {
+        g_debugMutex = new std::mutex();
+    }
+}
+
 ScopedPerfEventHelper::ScopedPerfEventHelper(const char *format, ...) : mFunctionName(nullptr)
 {
     bool dbgTrace = DebugAnnotationsActive();
@@ -140,6 +151,12 @@ LogMessage::LogMessage(const char *function, int line, LogSeverity severity)
 
 LogMessage::~LogMessage()
 {
+    std::unique_lock<std::mutex> lock;
+    if (g_debugMutex != nullptr)
+    {
+        lock = std::unique_lock<std::mutex>(*g_debugMutex);
+    }
+
     if (DebugAnnotationsInitialized() && (mSeverity == LOG_ERR || mSeverity == LOG_WARN))
     {
         g_debugAnnotator->logMessage(*this);

src/common/debug.h

@@ -98,6 +98,8 @@ void UninitializeDebugAnnotations();
 bool DebugAnnotationsActive();
 bool DebugAnnotationsInitialized();
 
+void InitializeDebugMutexIfNeeded();
+
 namespace priv
 {
 // This class is used to explicitly ignore values in the conditional logging macros. This avoids

src/libANGLE/Display.cpp

@@ -511,6 +511,8 @@ Error Display::initialize()
 
     gl::InitializeDebugAnnotations(&mAnnotator);
 
+    gl::InitializeDebugMutexIfNeeded();
+
     SCOPED_ANGLE_HISTOGRAM_TIMER("GPU.ANGLE.DisplayInitializeMS");
     TRACE_EVENT0("gpu.angle", "egl::Display::initialize");