From aefb6860e605d94853e46337d1ec1354ad273a86 Mon Sep 17 00:00:00 2001 From: Dale Glass Date: Sun, 5 Jun 2022 13:03:01 +0200 Subject: [PATCH] Replace mutex with recursive mutex (deprecated) --- libraries/shared/src/LogHandler.cpp | 5 +++-- libraries/shared/src/LogHandler.h | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/libraries/shared/src/LogHandler.cpp b/libraries/shared/src/LogHandler.cpp index 000d2d5e3b..50d2d53640 100644 --- a/libraries/shared/src/LogHandler.cpp +++ b/libraries/shared/src/LogHandler.cpp @@ -28,8 +28,9 @@ #include #include #include +#include -QMutex LogHandler::_mutex(QMutex::Recursive); +QRecursiveMutex LogHandler::_mutex; LogHandler& LogHandler::getInstance() { static LogHandler staticInstance; @@ -148,7 +149,7 @@ void LogHandler::flushRepeatedMessages() { for (int m = 0; m < (int)_repeatedMessageRecords.size(); ++m) { int repeatCount = _repeatedMessageRecords[m].repeatCount; if (repeatCount > 1) { - QString repeatLogMessage = QString().setNum(repeatCount) + " repeated log entries - Last entry: \"" + QString repeatLogMessage = QString().setNum(repeatCount) + " repeated log entries - Last entry: \"" + _repeatedMessageRecords[m].repeatString + "\""; printMessage(LogSuppressed, QMessageLogContext(), repeatLogMessage); _repeatedMessageRecords[m].repeatCount = 0; diff --git a/libraries/shared/src/LogHandler.h b/libraries/shared/src/LogHandler.h index b3a7805848..d314a4f7c2 100644 --- a/libraries/shared/src/LogHandler.h +++ b/libraries/shared/src/LogHandler.h @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include #include @@ -79,7 +79,7 @@ private: QString repeatString; }; std::vector _repeatedMessageRecords; - static QMutex _mutex; + static QRecursiveMutex _mutex; }; #define HIFI_FCDEBUG(category, message) \