From d0dc2fd47305687005cc80b054611ee6c207296e Mon Sep 17 00:00:00 2001 From: Jonas Devlieghere Date: Sun, 27 Apr 2025 11:26:30 -0700 Subject: [PATCH] [debugserver] Migrate DNBLog away from PThreadMutex (NFC) The debugserver code predates modern C++, but with C++11 and later there's no need to have something like PThreadMutex. This migrates DNBLog away from that class in preparation for removing PThreadMutex. --- lldb/tools/debugserver/source/DNBLog.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lldb/tools/debugserver/source/DNBLog.cpp b/lldb/tools/debugserver/source/DNBLog.cpp index d3045ace16f3d..6ad6b6598d1c3 100644 --- a/lldb/tools/debugserver/source/DNBLog.cpp +++ b/lldb/tools/debugserver/source/DNBLog.cpp @@ -17,7 +17,6 @@ static int g_verbose = 0; #if defined(DNBLOG_ENABLED) -#include "PThreadMutex.h" #include #include #include @@ -64,8 +63,8 @@ bool DNBLogEnabledForAny(uint32_t mask) { } static inline void _DNBLogVAPrintf(uint32_t flags, const char *format, va_list args) { - static PThreadMutex g_LogThreadedMutex(PTHREAD_MUTEX_RECURSIVE); - PTHREAD_MUTEX_LOCKER(locker, g_LogThreadedMutex); + static std::recursive_mutex g_LogThreadedMutex; + std::lock_guard guard(g_LogThreadedMutex); if (g_log_callback) g_log_callback(g_log_baton, flags, format, args);