Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 04:12:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Replace mutex with recursive mutex (deprecated)

Browse source
This commit is contained in:
Dale Glass 2022-06-05 13:03:01 +02:00
parent 38141ef655
commit aefb6860e6
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libraries/shared/src/LogHandler.cpp
View file

@ -28,8 +28,9 @@
#include <QtCore/QMutexLocker> #include <QtCore/QMutexLocker>
#include <QtCore/QThread> #include <QtCore/QThread>
#include <QtCore/QTimer> #include <QtCore/QTimer>
#include <QRecursiveMutex>
QMutex LogHandler::_mutex(QMutex::Recursive); QRecursiveMutex LogHandler::_mutex;
LogHandler& LogHandler::getInstance() { LogHandler& LogHandler::getInstance() {
static LogHandler staticInstance; static LogHandler staticInstance;
@ -148,7 +149,7 @@ void LogHandler::flushRepeatedMessages() {
for (int m = 0; m < (int)_repeatedMessageRecords.size(); ++m) { for (int m = 0; m < (int)_repeatedMessageRecords.size(); ++m) {
int repeatCount = _repeatedMessageRecords[m].repeatCount; int repeatCount = _repeatedMessageRecords[m].repeatCount;
if (repeatCount > 1) { 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 + "\""; + _repeatedMessageRecords[m].repeatString + "\"";
printMessage(LogSuppressed, QMessageLogContext(), repeatLogMessage); printMessage(LogSuppressed, QMessageLogContext(), repeatLogMessage);
_repeatedMessageRecords[m].repeatCount = 0; _repeatedMessageRecords[m].repeatCount = 0;

4
libraries/shared/src/LogHandler.h
View file

@ -16,7 +16,7 @@
#include <QObject> #include <QObject>
#include <QString> #include <QString>
#include <QRegExp> #include <QRegExp>
#include <QMutex> #include <QRecursiveMutex>
#include <vector> #include <vector>
#include <memory> #include <memory>
@ -79,7 +79,7 @@ private:
QString repeatString; QString repeatString;
}; };
std::vector<RepeatedMessageRecord> _repeatedMessageRecords; std::vector<RepeatedMessageRecord> _repeatedMessageRecords;
static QMutex _mutex; static QRecursiveMutex _mutex;
}; };
#define HIFI_FCDEBUG(category, message) \ #define HIFI_FCDEBUG(category, message) \